fix bug
Showing
3 changed files
with
13 additions
and
3 deletions
| ... | @@ -168,6 +168,7 @@ HEADERS_MAPPING.update( | ... | @@ -168,6 +168,7 @@ HEADERS_MAPPING.update( |
| 168 | { | 168 | { |
| 169 | '支出金额': OUTLAY_KEY, | 169 | '支出金额': OUTLAY_KEY, |
| 170 | '支出': OUTLAY_KEY, | 170 | '支出': OUTLAY_KEY, |
| 171 | '支取': OUTLAY_KEY, | ||
| 171 | '支取金额(借)': OUTLAY_KEY, | 172 | '支取金额(借)': OUTLAY_KEY, |
| 172 | '支取金额(借)': OUTLAY_KEY, | 173 | '支取金额(借)': OUTLAY_KEY, |
| 173 | } | 174 | } |
| ... | @@ -263,7 +264,7 @@ HEADERS_MAPPING.update( | ... | @@ -263,7 +264,7 @@ HEADERS_MAPPING.update( |
| 263 | HEADERS_MAPPING.update( | 264 | HEADERS_MAPPING.update( |
| 264 | { | 265 | { |
| 265 | '借贷发生额(借:-贷:+)': AMOUNT_KEY, | 266 | '借贷发生额(借:-贷:+)': AMOUNT_KEY, |
| 266 | '借贷发生额(借:-贷:+)': AMOUNT_KEY, | 267 | '借贷发生额(借:-贷:+)': AMOUNT_KEY, |
| 267 | } | 268 | } |
| 268 | ) | 269 | ) |
| 269 | 270 | ||
| ... | @@ -898,3 +899,10 @@ WECHART_HEADERS_MAPPING.update( | ... | @@ -898,3 +899,10 @@ WECHART_HEADERS_MAPPING.update( |
| 898 | '交易时间': DATE_KEY, | 899 | '交易时间': DATE_KEY, |
| 899 | } | 900 | } |
| 900 | ) | 901 | ) |
| 902 | |||
| 903 | PATTERN_LIST = ['收入', '存入', '支出', '支取', '金额', '余额', '发生额', '借贷', '借贷状态', '收/支', '收入金额', '存入金额(贷)', | ||
| 904 | '存入金额(贷)', '支出金额', '支取金额(借)', '支取金额(借)', '记账日期', '附言', '交易日期', '摘要', '业务摘要', | ||
| 905 | '收入/支出金额', '工作日期', '交易金额', '账户余额', '交易类型', '金额(元)', '金额(元)', '时间', '名称/备注', | ||
| 906 | '摘要/附言', '交易发生额', '交易摘要', '借贷发生额(借:-贷:+)', '借贷发生额(借:-贷:+)', '联机余额', '交易金额(元)', | ||
| 907 | '交易金额(元)', '账户余额(元)', '账户余额(元)', '会计日期', '摘要代码', '摘要信息', '日期', '短摘要', '本次余额', | ||
| 908 | '交易后余额', '交易说明', '帐户余额', '交易日期 记账日期'] | ... | ... |
| ... | @@ -33,13 +33,15 @@ class BSWorkbook(Workbook): | ... | @@ -33,13 +33,15 @@ class BSWorkbook(Workbook): |
| 33 | 33 | ||
| 34 | @staticmethod | 34 | @staticmethod |
| 35 | def get_header_col(header_value, classify): | 35 | def get_header_col(header_value, classify): |
| 36 | if header_value is None: | ||
| 37 | return | ||
| 36 | if classify == consts.WECHART_CLASSIFY: | 38 | if classify == consts.WECHART_CLASSIFY: |
| 37 | header_dict = consts.WECHART_HEADERS_MAPPING | 39 | header_dict = consts.WECHART_HEADERS_MAPPING |
| 38 | else: | 40 | else: |
| 39 | header_dict = consts.HEADERS_MAPPING | 41 | header_dict = consts.HEADERS_MAPPING |
| 40 | header_col = header_dict.get(header_value) | 42 | header_col = header_dict.get(header_value) |
| 41 | if header_col is None: | 43 | if header_col is None: |
| 42 | for pattern in header_dict.keys(): | 44 | for pattern in consts.PATTERN_LIST: |
| 43 | if re.search(pattern, header_value): | 45 | if re.search(pattern, header_value): |
| 44 | header_col = header_dict.get(pattern) | 46 | header_col = header_dict.get(pattern) |
| 45 | break | 47 | break | ... | ... |
| ... | @@ -12,7 +12,7 @@ from simple_config import Config, ConfigAttribute, converter | ... | @@ -12,7 +12,7 @@ from simple_config import Config, ConfigAttribute, converter |
| 12 | 12 | ||
| 13 | from . import _default_config | 13 | from . import _default_config |
| 14 | 14 | ||
| 15 | _SERVER_TYPE_LST = ['DEV', 'SIT', 'PRD'] | 15 | _SERVER_TYPE_LST = ['UAT', 'SIT', 'PRD'] |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | def service_is_online(server_type): | 18 | def service_is_online(server_type): | ... | ... |
-
Please register or sign in to post a comment