8628572e by 周伟奇

Merge branch 'feature/se_compare3' into feature/0611

2 parents 73004bca 297e01db
...@@ -1294,7 +1294,8 @@ SE_CORPORATE_ALL_FIELD = ['companyName', 'legalRepName', 'firstIdNo', 'businessL ...@@ -1294,7 +1294,8 @@ SE_CORPORATE_ALL_FIELD = ['companyName', 'legalRepName', 'firstIdNo', 'businessL
1294 'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate'] 1294 'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate']
1295 SE_NEW_FIELD = ['vinNo', 'dealer', 'vehicleTransactionAmount'] 1295 SE_NEW_FIELD = ['vinNo', 'dealer', 'vehicleTransactionAmount']
1296 SE_USED_FIELD = ['vinNo', 'vehicleTransactionAmount'] 1296 SE_USED_FIELD = ['vinNo', 'vehicleTransactionAmount']
1297 SE_NEW_ADD_FIELD = ['customerName', 'idNum', 'dateOfInvoice'] 1297 SE_NEW_ADD_FIELD = ['customerName', 'idNum', 'dateOfInvoice', 'stamp']
1298 SE_STAMP_VALUE = '有'
1298 SE_GB_NEW_FIELD = ['vinNo'] 1299 SE_GB_NEW_FIELD = ['vinNo']
1299 SE_GB_USED_FIELD = ['customerName', 'idNum', 'date'] 1300 SE_GB_USED_FIELD = ['customerName', 'idNum', 'date']
1300 1301
...@@ -1368,6 +1369,7 @@ MVI_COMPARE_LOGIC = { ...@@ -1368,6 +1369,7 @@ MVI_COMPARE_LOGIC = {
1368 'customerName': ('购方名称', 'se_name_compare', {}), 1369 'customerName': ('购方名称', 'se_name_compare', {}),
1369 'idNum': ('购买方身份证号或组织机构代码', 'se_contain_compare_2', {}), 1370 'idNum': ('购买方身份证号或组织机构代码', 'se_contain_compare_2', {}),
1370 'dateOfInvoice': ('开票日期', 'se_date_compare_2', {}), 1371 'dateOfInvoice': ('开票日期', 'se_date_compare_2', {}),
1372 'stamp': ('发票章', 'se_common_compare', {}),
1371 } 1373 }
1372 1374
1373 UCI_COMPARE_LOGIC = { 1375 UCI_COMPARE_LOGIC = {
...@@ -1375,6 +1377,7 @@ UCI_COMPARE_LOGIC = { ...@@ -1375,6 +1377,7 @@ UCI_COMPARE_LOGIC = {
1375 'vehicleTransactionAmount': ('价税合计小写', 'se_amount_compare', {}), 1377 'vehicleTransactionAmount': ('价税合计小写', 'se_amount_compare', {}),
1376 'customerName': ('购方名称', 'se_name_compare', {}), 1378 'customerName': ('购方名称', 'se_name_compare', {}),
1377 'idNum': ('购方纳税人识别号', 'se_contain_compare_2', {}), 1379 'idNum': ('购方纳税人识别号', 'se_contain_compare_2', {}),
1380 'stamp': ('发票章', 'se_common_compare', {}),
1378 } 1381 }
1379 1382
1380 MVC_COMPARE_LOGIC = { 1383 MVC_COMPARE_LOGIC = {
......
...@@ -574,6 +574,7 @@ def get_se_compare_info(last_obj, application_entity): ...@@ -574,6 +574,7 @@ def get_se_compare_info(last_obj, application_entity):
574 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], main_name)) 574 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], main_name))
575 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], main_num)) 575 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], main_num))
576 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[2], last_obj.first_submmison_date)) 576 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[2], last_obj.first_submmison_date))
577 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[3], consts.SE_STAMP_VALUE))
577 vehicle_info[consts.MVI_EN] = vehicle_field_input 578 vehicle_info[consts.MVI_EN] = vehicle_field_input
578 else: 579 else:
579 gb_field_input = [] 580 gb_field_input = []
...@@ -593,6 +594,7 @@ def get_se_compare_info(last_obj, application_entity): ...@@ -593,6 +594,7 @@ def get_se_compare_info(last_obj, application_entity):
593 gb34_field_input.append((consts.SE_GB_USED_FIELD[0], main_name)) 594 gb34_field_input.append((consts.SE_GB_USED_FIELD[0], main_name))
594 gb34_field_input.append((consts.SE_GB_USED_FIELD[1], main_num)) 595 gb34_field_input.append((consts.SE_GB_USED_FIELD[1], main_num))
595 gb34_field_input.append((consts.SE_GB_USED_FIELD[2], last_obj.first_submmison_date)) 596 gb34_field_input.append((consts.SE_GB_USED_FIELD[2], last_obj.first_submmison_date))
597 vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[3], consts.SE_STAMP_VALUE))
596 vehicle_info[consts.UCI_EN] = vehicle_field_input 598 vehicle_info[consts.UCI_EN] = vehicle_field_input
597 vehicle_info[consts.MVC_EN] = gb_field_input 599 vehicle_info[consts.MVC_EN] = gb_field_input
598 vehicle_info[consts.MVC34_EN] = gb34_field_input 600 vehicle_info[consts.MVC34_EN] = gb34_field_input
......
...@@ -157,7 +157,7 @@ class Comparison: ...@@ -157,7 +157,7 @@ class Comparison:
157 157
158 def se_date_compare(self, input_str, ocr_str, **kwargs): 158 def se_date_compare(self, input_str, ocr_str, **kwargs):
159 if kwargs.get('long', False): 159 if kwargs.get('long', False):
160 if '长期' in ocr_str or '永久' in ocr_str: 160 if '长期' in ocr_str or '永久' in ocr_str or '***' in ocr_str or '至今' in ocr_str:
161 if input_str in ['2099-12-31', '2099-01-01', '2999-12-31', '2999-01-01']: 161 if input_str in ['2099-12-31', '2099-01-01', '2999-12-31', '2999-01-01']:
162 return self.RESULT_Y 162 return self.RESULT_Y
163 else: 163 else:
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!