SE compare

@@ -1750,7 +1750,7 @@ ZZSSE_FIELD = '增值税税额'
 
 
 MVI_COMPARE_LOGIC = {
 MVI_COMPARE_LOGIC = {
     'vinNo': ('车辆识别代码', 'se_common_compare', {}, '发票车架号与系统不一致'),
     'vinNo': ('车辆识别代码', 'se_common_compare', {}, '发票车架号与系统不一致'),
-    'dealer': ('销方名称', 'se_contain_compare_2', {'brackets_replace': True}, '发票销货单位名称与系统不一致'),
+    'dealer': ('销方名称', 'se_common_compare', {'brackets_replace': True}, '发票销货单位名称与系统不一致'),
     'vehicleTransactionAmount': ('价税合计小写', 'se_amount_compare', {}, '发票车辆价格与系统不一致'),
     'vehicleTransactionAmount': ('价税合计小写', 'se_amount_compare', {}, '发票车辆价格与系统不一致'),
     'customerName': ('购方名称', 'se_name_compare', {'is_passport': True, 'replace_kuohao': True}, '发票购买方姓名与系统不一致'),
     'customerName': ('购方名称', 'se_name_compare', {'is_passport': True, 'replace_kuohao': True}, '发票购买方姓名与系统不一致'),
     'idNum': ('购买方身份证号或组织机构代码', 'se_common_compare', {}, '发票购买方证件号码与系统不一致'),
     'idNum': ('购买方身份证号或组织机构代码', 'se_common_compare', {}, '发票购买方证件号码与系统不一致'),
@@ -1884,7 +1884,7 @@ HIL_CONTRACT_1_COMPARE_LOGIC = {
     '车辆识别代码': ('车辆识别代码', 'se_common_compare', {}, '售后回租合同车辆识别代码与系统车架号不一致'),
     '车辆识别代码': ('车辆识别代码', 'se_common_compare', {}, '售后回租合同车辆识别代码与系统车架号不一致'),
     '车辆卖方': ('车辆卖方', 'se_common_compare', {}, '售后回租合同车辆卖方与系统经销商不一致'),
     '车辆卖方': ('车辆卖方', 'se_common_compare', {}, '售后回租合同车辆卖方与系统经销商不一致'),
     '车辆原始销售价格': ('车辆原始销售价格', 'se_amount_str_compare', {}, '售后回租合同车辆原始销售价格与系统车辆价格不一致'),
     '车辆原始销售价格': ('车辆原始销售价格', 'se_amount_str_compare', {}, '售后回租合同车辆原始销售价格与系统车辆价格不一致'),
-    '融资成本总额': ('融资成本总额', 'se_amount_str_compare', {}, '售后回租合同ASP融资成本总额与系统不一致'),
+    '融资成本总额': ('融资成本总额', 'se_amount_str_compare', {}, '售后回租合同融资成本总额与系统不一致'),
     '租期': ('租期', 'se_contain_compare', {}, '售后回租合同首页中贷款期限系统不一致'),
     '租期': ('租期', 'se_contain_compare', {}, '售后回租合同首页中贷款期限系统不一致'),
     '还款计划表': ('还款计划表', 'se_schedule_compare', {"value_idx": 1}, '售后回租合同还款计划表与系统不一致'),
     '还款计划表': ('还款计划表', 'se_schedule_compare', {"value_idx": 1}, '售后回租合同还款计划表与系统不一致'),
     'ASP项目详情': ('ASP项目详情', 'se_asp_compare', {}, '售后回租合同ASP名称或者金额与系统不一致'),
     'ASP项目详情': ('ASP项目详情', 'se_asp_compare', {}, '售后回租合同ASP名称或者金额与系统不一致'),

@@ -910,7 +910,10 @@ class Command(BaseCommand, LoggerMixin):
             try:
             try:
                 print_date = bs_info.get('print_time', '').strftime("%Y-%m-%d")
                 print_date = bs_info.get('print_time', '').strftime("%Y-%m-%d")
             except Exception as e:
             except Exception as e:
-                print_date = ''
+                try:
+                    print_date = bs_info.get('end_date', '').strftime("%Y-%m-%d")
+                except Exception as e:
+                    print_date = ''
             res.append(
             res.append(
                 {
                 {
                     'role': bs_info.get('role', ''),
                     'role': bs_info.get('role', ''),

@@ -736,6 +736,7 @@ class BSWorkbook(Workbook):
                                                   metadata)
                                                   metadata)
 
 
             summary['timedelta'] = timedelta
             summary['timedelta'] = timedelta
+            summary['end_date'] = end_date
 
 
             # 3.创建月份表、提取/高亮关键行
             # 3.创建月份表、提取/高亮关键行
             # 倒序处理
             # 倒序处理

@@ -883,6 +883,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
 
 
     dealer_name_list = cms_info.get('dealerName', '').split()
     dealer_name_list = cms_info.get('dealerName', '').split()
     dealer_name = '' if len(dealer_name_list) == 0 else dealer_name_list[-1]
     dealer_name = '' if len(dealer_name_list) == 0 else dealer_name_list[-1]
+    issuer_dealer = cms_info.get('fapiaoIssuerDealer', '').strip()
 
 
     # 个人信息证件------------------------------------------------------------------------------------------------------
     # 个人信息证件------------------------------------------------------------------------------------------------------
     # is_cdfl = True  # 车贷分离
     # is_cdfl = True  # 车贷分离
@@ -1009,7 +1010,7 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
     # 新车发票----------------------------------------------------------------------------------------------------------
     # 新车发票----------------------------------------------------------------------------------------------------------
     if vehicle_status == 'New':
     if vehicle_status == 'New':
         vehicle_field_input.append(('vinNo', vin_no))
         vehicle_field_input.append(('vinNo', vin_no))
-        vehicle_field_input.append(('dealer', '、'.join([dealer_name, cms_info.get('fapiaoIssuerDealer', '')])))
+        vehicle_field_input.append(('dealer', dealer_name if len(issuer_dealer) == 0 else issuer_dealer))
         vehicle_field_input.append(('vehicleTransactionAmount', amount))
         vehicle_field_input.append(('vehicleTransactionAmount', amount))
 
 
         if isinstance(company_info, tuple):
         if isinstance(company_info, tuple):
@@ -1409,6 +1410,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
 
 
     dealer_name_list = cms_info.get('dealerName', '').split()
     dealer_name_list = cms_info.get('dealerName', '').split()
     dealer_name = '' if len(dealer_name_list) == 0 else dealer_name_list[-1]
     dealer_name = '' if len(dealer_name_list) == 0 else dealer_name_list[-1]
+    issuer_dealer = cms_info.get('fapiaoIssuerDealer', '').strip()
 
 
     # 个人信息证件------------------------------------------------------------------------------------------------------
     # 个人信息证件------------------------------------------------------------------------------------------------------
     is_cdfl_bo = False  # 车贷分离，主借
     is_cdfl_bo = False  # 车贷分离，主借
@@ -1529,7 +1531,7 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
     # 新车发票----------------------------------------------------------------------------------------------------------
     # 新车发票----------------------------------------------------------------------------------------------------------
     if vehicle_status == 'New':
     if vehicle_status == 'New':
         vehicle_field_input.append(('vinNo', vin_no))
         vehicle_field_input.append(('vinNo', vin_no))
-        vehicle_field_input.append(('dealer', '、'.join([dealer_name, cms_info.get('fapiaoIssuerDealer', '')])))
+        vehicle_field_input.append(('dealer', dealer_name if len(issuer_dealer) == 0 else issuer_dealer))
         vehicle_field_input.append(('vehicleTransactionAmount', amount))
         vehicle_field_input.append(('vehicleTransactionAmount', amount))
 
 
         if isinstance(company_info, tuple):
         if isinstance(company_info, tuple):

@@ -301,6 +301,9 @@ class Comparison:
                 return self.RESULT_Y
                 return self.RESULT_Y
         if kwargs.get('remove_space', False):
         if kwargs.get('remove_space', False):
             input_str = input_str.replace(' ', '')
             input_str = input_str.replace(' ', '')
+        if kwargs.get('brackets_replace', False):
+            input_str = input_str.translate(self.KH_TRANS)
+            ocr_str = ocr_str.translate(self.KH_TRANS)
         return self.build_res(input_str == ocr_str)
         return self.build_res(input_str == ocr_str)
 
 
     def ca_common_compare(self, input_str, ocr_str, **kwargs):
     def ca_common_compare(self, input_str, ocr_str, **kwargs):
@@ -454,7 +457,8 @@ class Comparison:
         else:
         else:
             try:
             try:
                 float_input = float(input_str)
                 float_input = float(input_str)
-                float_ocr = float(ocr_str)
+                digit_ocr_str = ''.join(filter(lambda i: i in [',', '.'] or str.isdigit(i), ocr_str))
+                float_ocr = float(digit_ocr_str)
             except Exception as e:
             except Exception as e:
                 return self.RESULT_N
                 return self.RESULT_N
             else:
             else: