Merge branch 'feature/se_compare3' into feature/0611

@@ -1409,7 +1409,7 @@ DDA_COMPARE_LOGIC = {
     'companyName': ('to_company', 'se_company_compare', {}),
     'companyName': ('to_company', 'se_company_compare', {}),
     'customerName': (DDA_IC_NAME, 'se_contain_compare_2', {}),
     'customerName': (DDA_IC_NAME, 'se_contain_compare_2', {}),
     'idNum': (DDA_IC_ID, 'se_contain_compare_2', {}),
     'idNum': (DDA_IC_ID, 'se_contain_compare_2', {}),
-    'accountHolderName': (DDA_BC_NAME, 'se_common_compare', {}),
+    'accountHolderName': (DDA_BC_NAME, 'se_name_compare', {}),
     'accountNo': (DDA_BC_ID, 'se_common_compare', {}),
     'accountNo': (DDA_BC_ID, 'se_common_compare', {}),
 }
 }
 
 

@@ -489,7 +489,7 @@ def get_se_compare_info(last_obj, application_entity):
         else:
         else:
             id_num = individual_info['idNum']
             id_num = individual_info['idNum']
         main_role_info.setdefault(individual_info['applicantType'], []).append(
         main_role_info.setdefault(individual_info['applicantType'], []).append(
-            (individual_info['customerName'], id_num))
+            (individual_info['customerName'], id_num, individual_info['idNum']))
 
 
         license_dict = {}
         license_dict = {}
 
 
@@ -526,11 +526,11 @@ def get_se_compare_info(last_obj, application_entity):
     dda_num_list = []
     dda_num_list = []
     for applicant_type in consts.APPLICANT_TYPE:
     for applicant_type in consts.APPLICANT_TYPE:
         if applicant_type in main_role_info:
         if applicant_type in main_role_info:
-            main_name, main_num = main_role_info[applicant_type][0]
+            main_name, main_num, _ = main_role_info[applicant_type][0]
             break
             break
     for applicant_type in consts.APPLICANT_TYPE[:2]:
     for applicant_type in consts.APPLICANT_TYPE[:2]:
         if applicant_type in main_role_info:
         if applicant_type in main_role_info:
-            for dda_name_part, dda_num_part in main_role_info[applicant_type]:
+            for dda_name_part, _, dda_num_part in main_role_info[applicant_type]:
                 dda_name_list.append(dda_name_part)
                 dda_name_list.append(dda_name_part)
                 dda_num_list.append(dda_num_part)
                 dda_num_list.append(dda_num_part)
     dda_name = '、'.join(dda_name_list)
     dda_name = '、'.join(dda_name_list)

@@ -144,6 +144,9 @@ class Comparison:
             if input_tmp.find(ocr_tmp) == -1:
             if input_tmp.find(ocr_tmp) == -1:
                 return self.RESULT_N
                 return self.RESULT_N
             else:
             else:
+                if ocr_str.strip() == '':
+                    return self.RESULT_N
+                else:
                     return self.RESULT_Y
                     return self.RESULT_Y
         else:
         else:
             # if re.search(r'[a-zA-Z]]', input_str):
             # if re.search(r'[a-zA-Z]]', input_str):
@@ -177,18 +180,27 @@ class Comparison:
         if ocr_str.find(input_str) == -1:
         if ocr_str.find(input_str) == -1:
             return self.RESULT_N
             return self.RESULT_N
         else:
         else:
+            if ocr_str.strip() == '':
+                return self.RESULT_N
+            else:
                 return self.RESULT_Y
                 return self.RESULT_Y
 
 
     def se_contain_compare_2(self, input_str, ocr_str, **kwargs):
     def se_contain_compare_2(self, input_str, ocr_str, **kwargs):
         if input_str.find(ocr_str) == -1:
         if input_str.find(ocr_str) == -1:
             return self.RESULT_N
             return self.RESULT_N
         else:
         else:
+            if ocr_str.strip() == '':
+                return self.RESULT_N
+            else:
                 return self.RESULT_Y
                 return self.RESULT_Y
 
 
     def se_both_contain_compare(self, input_str, ocr_str, **kwargs):
     def se_both_contain_compare(self, input_str, ocr_str, **kwargs):
         if ocr_str.find(input_str) == -1 and input_str.find(ocr_str) == -1:
         if ocr_str.find(input_str) == -1 and input_str.find(ocr_str) == -1:
             return self.RESULT_N
             return self.RESULT_N
         else:
         else:
+            if ocr_str.strip() == '':
+                return self.RESULT_N
+            else:
                 return self.RESULT_Y
                 return self.RESULT_Y
 
 
     def se_amount_compare(self, input_str, ocr_str, **kwargs):
     def se_amount_compare(self, input_str, ocr_str, **kwargs):
@@ -235,7 +247,7 @@ class Comparison:
         except Exception as e:
         except Exception as e:
             return self.RESULT_N
             return self.RESULT_N
         else:
         else:
-            return self.build_res(input_date >= ocr_date)
+            return self.build_res(input_date <= ocr_date)
 
 
 
 
 cp = Comparison()
 cp = Comparison()