fix bug
Showing
3 changed files
with
7 additions
and
2 deletions
... | @@ -1258,7 +1258,8 @@ SE_CORPORATE_ALL_FIELD = ['companyName', 'legalRepName', 'firstIdNo', 'businessL | ... | @@ -1258,7 +1258,8 @@ SE_CORPORATE_ALL_FIELD = ['companyName', 'legalRepName', 'firstIdNo', 'businessL |
1258 | 'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate'] | 1258 | 'taxRegistrationCertificateNo', 'establishmentDate', 'businessLicenseDueDate'] |
1259 | SE_NEW_FIELD = ['vinNo', 'dealer', 'vehicleTransactionAmount'] | 1259 | SE_NEW_FIELD = ['vinNo', 'dealer', 'vehicleTransactionAmount'] |
1260 | SE_USED_FIELD = ['vinNo', 'vehicleTransactionAmount'] | 1260 | SE_USED_FIELD = ['vinNo', 'vehicleTransactionAmount'] |
1261 | SE_NEW_ADD_FIELD = ['customerName', 'idNum', 'dateOfInvoice'] | 1261 | SE_NEW_ADD_FIELD = ['customerName', 'idNum', 'dateOfInvoice', 'stamp'] |
1262 | SE_STAMP_VALUE = '有' | ||
1262 | SE_GB_NEW_FIELD = ['vinNo'] | 1263 | SE_GB_NEW_FIELD = ['vinNo'] |
1263 | SE_GB_USED_FIELD = ['customerName', 'idNum', 'date'] | 1264 | SE_GB_USED_FIELD = ['customerName', 'idNum', 'date'] |
1264 | 1265 | ||
... | @@ -1332,6 +1333,7 @@ MVI_COMPARE_LOGIC = { | ... | @@ -1332,6 +1333,7 @@ MVI_COMPARE_LOGIC = { |
1332 | 'customerName': ('购方名称', 'se_name_compare', {}), | 1333 | 'customerName': ('购方名称', 'se_name_compare', {}), |
1333 | 'idNum': ('购买方身份证号或组织机构代码', 'se_contain_compare_2', {}), | 1334 | 'idNum': ('购买方身份证号或组织机构代码', 'se_contain_compare_2', {}), |
1334 | 'dateOfInvoice': ('开票日期', 'se_date_compare_2', {}), | 1335 | 'dateOfInvoice': ('开票日期', 'se_date_compare_2', {}), |
1336 | 'stamp': ('发票章', 'se_common_compare', {}), | ||
1335 | } | 1337 | } |
1336 | 1338 | ||
1337 | UCI_COMPARE_LOGIC = { | 1339 | UCI_COMPARE_LOGIC = { |
... | @@ -1339,6 +1341,7 @@ UCI_COMPARE_LOGIC = { | ... | @@ -1339,6 +1341,7 @@ UCI_COMPARE_LOGIC = { |
1339 | 'vehicleTransactionAmount': ('价税合计小写', 'se_amount_compare', {}), | 1341 | 'vehicleTransactionAmount': ('价税合计小写', 'se_amount_compare', {}), |
1340 | 'customerName': ('购方名称', 'se_name_compare', {}), | 1342 | 'customerName': ('购方名称', 'se_name_compare', {}), |
1341 | 'idNum': ('购方纳税人识别号', 'se_contain_compare_2', {}), | 1343 | 'idNum': ('购方纳税人识别号', 'se_contain_compare_2', {}), |
1344 | 'stamp': ('发票章', 'se_common_compare', {}), | ||
1342 | } | 1345 | } |
1343 | 1346 | ||
1344 | MVC_COMPARE_LOGIC = { | 1347 | MVC_COMPARE_LOGIC = { | ... | ... |
... | @@ -530,6 +530,7 @@ def get_se_compare_info(last_obj, application_entity): | ... | @@ -530,6 +530,7 @@ def get_se_compare_info(last_obj, application_entity): |
530 | vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], main_name)) | 530 | vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[0], main_name)) |
531 | vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], main_num)) | 531 | vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[1], main_num)) |
532 | vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[2], last_obj.first_submmison_date)) | 532 | vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[2], last_obj.first_submmison_date)) |
533 | vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[3], consts.SE_STAMP_VALUE)) | ||
533 | vehicle_info[consts.MVI_EN] = vehicle_field_input | 534 | vehicle_info[consts.MVI_EN] = vehicle_field_input |
534 | else: | 535 | else: |
535 | gb_field_input = [] | 536 | gb_field_input = [] |
... | @@ -549,6 +550,7 @@ def get_se_compare_info(last_obj, application_entity): | ... | @@ -549,6 +550,7 @@ def get_se_compare_info(last_obj, application_entity): |
549 | gb34_field_input.append((consts.SE_GB_USED_FIELD[0], main_name)) | 550 | gb34_field_input.append((consts.SE_GB_USED_FIELD[0], main_name)) |
550 | gb34_field_input.append((consts.SE_GB_USED_FIELD[1], main_num)) | 551 | gb34_field_input.append((consts.SE_GB_USED_FIELD[1], main_num)) |
551 | gb34_field_input.append((consts.SE_GB_USED_FIELD[2], last_obj.first_submmison_date)) | 552 | gb34_field_input.append((consts.SE_GB_USED_FIELD[2], last_obj.first_submmison_date)) |
553 | vehicle_field_input.append((consts.SE_NEW_ADD_FIELD[3], consts.SE_STAMP_VALUE)) | ||
552 | vehicle_info[consts.UCI_EN] = vehicle_field_input | 554 | vehicle_info[consts.UCI_EN] = vehicle_field_input |
553 | vehicle_info[consts.MVC_EN] = gb_field_input | 555 | vehicle_info[consts.MVC_EN] = gb_field_input |
554 | vehicle_info[consts.MVC34_EN] = gb34_field_input | 556 | 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: | ... | ... |
-
Please register or sign in to post a comment