Merge branch 'feature/CHINARPA-5504'

冯轩
Showing 2 changed files with 12 additions and 9 deletions
src/celery_compare/tasks.py
src/prese/compare.py
--- a/src/celery_compare/tasks.py
View file @c06bbf3
+++ b/src/celery_compare/tasks.py
View file @c06bbf3
@@ -1576,9 +1576,10 @@ def get_se_cms_compare_info_auto(application_id, last_obj, application_entity, d
            if not is_find and is_force:
                afc_contract_input.append((key, empty_str))
-        if online_sign and data_source == 'ECONTRACT':
+        # CHINARPA-5504 去掉见证人签字及日期
-            afc_contract_input.append((consts.SE_AFC_CON_FIELD[18], consts.SE_STAMP_VALUE))
+        # if online_sign and data_source == 'ECONTRACT':
-            afc_contract_input.append((consts.SE_AFC_CON_FIELD[19], empty_str))
+        #     afc_contract_input.append((consts.SE_AFC_CON_FIELD[18], consts.SE_STAMP_VALUE))
+        #     afc_contract_input.append((consts.SE_AFC_CON_FIELD[19], empty_str))
        contract_info[consts.AFC_CONTRACT_EN] = afc_contract_input
@@ -2233,9 +2234,10 @@ def get_se_cms_compare_info(application_id, last_obj, application_entity, detect
            if not is_find and is_force:
                afc_contract_input.append((key, empty_str))
-        if online_sign and data_source == 'ECONTRACT':
+        # CHINARPA-5504 去掉见证人签字及日期
-            afc_contract_input.append((consts.SE_AFC_CON_FIELD[18], consts.SE_STAMP_VALUE))
+        # if online_sign and data_source == 'ECONTRACT':
-            afc_contract_input.append((consts.SE_AFC_CON_FIELD[19], empty_str))
+        #     afc_contract_input.append((consts.SE_AFC_CON_FIELD[18], consts.SE_STAMP_VALUE))
+        #     afc_contract_input.append((consts.SE_AFC_CON_FIELD[19], empty_str))
        contract_info[consts.AFC_CONTRACT_EN] = afc_contract_input
--- a/src/prese/compare.py
View file @c06bbf3
+++ b/src/prese/compare.py
View file @c06bbf3
@@ -175,9 +175,10 @@ def get_pos_compare_info(pos_info, data_source):
            afc_contract_input.append((consts.AFC_CON_FIELDS[8], asp_list))
            afc_contract_input.append((consts.AFC_CON_FIELDS[9], asp_list))
-        if data_source == 'ECONTRACT':
+        # CHINARPA-5504 去掉见证人签字及日期
-            afc_contract_input.append((consts.AFC_CON_FIELDS[10], consts.HAVE_CN))
+        # if data_source == 'ECONTRACT':
-            afc_contract_input.append((consts.AFC_CON_FIELDS[11], empty_str))
+        #     afc_contract_input.append((consts.AFC_CON_FIELDS[10], consts.HAVE_CN))
+        #     afc_contract_input.append((consts.AFC_CON_FIELDS[11], empty_str))
        compare_info.setdefault(consts.AFC_CONTRACT_EN, []).append(afc_contract_input)