fix bug
Showing
2 changed files
with
18 additions
and
11 deletions
... | @@ -92,7 +92,9 @@ def get_pos_compare_info(pos_info): | ... | @@ -92,7 +92,9 @@ def get_pos_compare_info(pos_info): |
92 | # 合同准备项 | 92 | # 合同准备项 |
93 | # 还款计划表 | 93 | # 还款计划表 |
94 | schedule_list = [] | 94 | schedule_list = [] |
95 | for schedule_dict in quotationt_info.get('monthlyPaymentInfo', []): | 95 | no_sort_tmp_list = quotationt_info.get('monthlyPaymentInfo', []) |
96 | no_sort_tmp_list.sort(key=lambda x: x['term']) | ||
97 | for schedule_dict in no_sort_tmp_list: | ||
96 | tmp_str = "{1}{0}{2}".format(consts.SPLIT_STR, str(schedule_dict.get('term', '')), | 98 | tmp_str = "{1}{0}{2}".format(consts.SPLIT_STR, str(schedule_dict.get('term', '')), |
97 | str(schedule_dict.get('amount', ''))) | 99 | str(schedule_dict.get('amount', ''))) |
98 | schedule_list.append(tmp_str) | 100 | schedule_list.append(tmp_str) |
... | @@ -113,7 +115,7 @@ def get_pos_compare_info(pos_info): | ... | @@ -113,7 +115,7 @@ def get_pos_compare_info(pos_info): |
113 | ( | 115 | ( |
114 | consts.ASP_SUM_NAME, | 116 | consts.ASP_SUM_NAME, |
115 | '', | 117 | '', |
116 | format(quotationt_info.get('associatedServicePrincipal', 0), '.2f'), | 118 | str(quotationt_info.get('associatedServicePrincipal', 0)), |
117 | ) | 119 | ) |
118 | ) | 120 | ) |
119 | 121 | ||
... | @@ -318,7 +320,7 @@ def pre_compare_license_id(license_en, id_res_list, field_list, applicant_type): | ... | @@ -318,7 +320,7 @@ def pre_compare_license_id(license_en, id_res_list, field_list, applicant_type): |
318 | result_field_list.append((value, ocr_str, result, '{0}{1}'.format(applicant_type, comments))) | 320 | result_field_list.append((value, ocr_str, result, '{0}{1}'.format(applicant_type, comments))) |
319 | 321 | ||
320 | if not is_find: | 322 | if not is_find: |
321 | result_field_list = [(empty_str, empty_str, consts.RESULT_N, '{0}{1}'.format(applicant_type, no_find_comment))] | 323 | result_field_list = [(empty_str, empty_str, consts.RESULT_N, no_find_comment.format(applicant_type))] |
322 | 324 | ||
323 | return result_field_list | 325 | return result_field_list |
324 | 326 | ... | ... |
... | @@ -110,17 +110,22 @@ HT_COMPARE_LOGIC = { | ... | @@ -110,17 +110,22 @@ HT_COMPARE_LOGIC = { |
110 | 110 | ||
111 | AFC_CON_FIELDS[8]: ('ASP项目详情-重要条款', 'se_asp_compare', {}, '合同(重要条款)ASP名称或者金额与系统不一致'), | 111 | AFC_CON_FIELDS[8]: ('ASP项目详情-重要条款', 'se_asp_compare', {}, '合同(重要条款)ASP名称或者金额与系统不一致'), |
112 | AFC_CON_FIELDS[9]: ('ASP项目详情', 'se_asp_compare', {}, '合同ASP名称或者金额与系统不一致'), | 112 | AFC_CON_FIELDS[9]: ('ASP项目详情', 'se_asp_compare', {}, '合同ASP名称或者金额与系统不一致'), |
113 | |||
114 | '主借人日期': ('主借人日期', 'se_have_compare', {}, '合同主借款人签字日期无'), | ||
115 | '共借人日期': ('共借人日期', 'se_have_compare', {}, '合同共借人签字日期无'), | ||
116 | '保证人日期1': ('保证人日期1', 'se_have_compare', {}, '合同担保人1签字日期无'), | ||
117 | '保证人日期2': ('保证人日期2', 'se_have_compare', {}, '合同担保人2签字日期无'), | ||
113 | } | 118 | } |
114 | 119 | ||
115 | ID_COMPARE_LOGIC = { | 120 | ID_COMPARE_LOGIC = { |
116 | 'customerName': ('姓名', 'se_name_compare', {}, '身份证姓名与系统不一致'), | 121 | ID_FIELDS[0]: ('姓名', 'se_name_compare', {}, '身份证姓名与系统不一致'), |
117 | 'idNum': ('公民身份号码', 'se_common_compare', {}, '身份证号码与系统不一致'), | 122 | ID_FIELDS[1]: ('公民身份号码', 'se_common_compare', {}, '身份证号码与系统不一致'), |
118 | 123 | ||
119 | 'idExpiryDate': ('有效期限', 'se_date_compare_pre', {}, '身份证有效期疑似过期'), | 124 | ID_FIELDS[2]: ('有效期限', 'se_date_compare_pre', {}, '身份证有效期疑似过期'), |
120 | } | 125 | } |
121 | 126 | ||
122 | PRE_COMPARE_LOGIC_MAP = { | 127 | PRE_COMPARE_LOGIC_MAP = { |
123 | ID_EN: (ID_OCR_FIELD, ID_COMPARE_LOGIC, '请确认是否提供身份证件'), | 128 | ID_EN: (ID_OCR_FIELD, ID_COMPARE_LOGIC, '请确认是否提供{0}身份证件'), |
124 | MVI_EN: (MVI_OCR_FIELD, MVI_COMPARE_LOGIC, '请确认是否提供发票'), | 129 | MVI_EN: (MVI_OCR_FIELD, MVI_COMPARE_LOGIC, '请确认是否提供发票'), |
125 | BC_EN: (BC_OCR_FIELD, BC_COMPARE_LOGIC, '请确认是否提供银行卡'), | 130 | BC_EN: (BC_OCR_FIELD, BC_COMPARE_LOGIC, '请确认是否提供银行卡'), |
126 | HMH_EN: (HMH_OCR_FIELD, HMH_COMPARE_LOGIC, '请确认是否已完成抵押登记豁免函签署'), | 131 | HMH_EN: (HMH_OCR_FIELD, HMH_COMPARE_LOGIC, '请确认是否已完成抵押登记豁免函签署'), |
... | @@ -143,8 +148,8 @@ ID_DATE_MAP = { | ... | @@ -143,8 +148,8 @@ ID_DATE_MAP = { |
143 | } | 148 | } |
144 | 149 | ||
145 | APPLICANT_TYPE_MAP = { | 150 | APPLICANT_TYPE_MAP = { |
146 | 'CUSTR': 'Applicant', | 151 | 'CUSTR': '主借人', |
147 | 'COAPP': 'Co Applicant', | 152 | 'COAPP': '共借人', |
148 | 'GAUTR1': 'guarantor1', | 153 | 'GAUTR1': '担保人1', |
149 | 'GAUTR2': 'guarantor2', | 154 | 'GAUTR2': '担保人2', |
150 | } | 155 | } | ... | ... |
-
Please register or sign in to post a comment