Merge branch 'feature/CHINARPA-3290-FSM-AUTO'

@@ -1569,6 +1569,7 @@ SE_AFC_CON_MAP = {
     '见证人日期': (7, 8, '见证人签字', '日期'),
 
     '还款计划表': (3, 3, '还款计划表', None),
+    '车辆代理商': (3, 3, '车辆代理商', None),
 
     'ASP项目详情-重要条款': (None, 1, '附加产品融资贷款本金总金额明细', None),
     'ASP项目详情': (None, 4, '附加产品融资贷款本金总金额明细', None),
@@ -1612,6 +1613,8 @@ SE_HIL_CON_1_MAP = {
 
     '共同承租人&抵押人姓名': (1, 1, 7, '共同承租人-姓名', None),
     '共同承租人&抵押人证件号': (1, 1, 7, '共同承租人-证件号码', None),
+
+    '车辆代理商': (5, 5, 7, '车辆代理商', None),
 }
 
 SE_HIL_CON_2_MAP = {

@@ -948,7 +948,8 @@ class Command(BaseCommand, LoggerMixin):
                     'role': bs_info.get('role', ''),
                     'print_time': print_date,
                     'timedelta': bs_info.get('timedelta', ''),
-                    'verify': bs_info.get('verify_res_ebank', True)
+                    'verify': bs_info.get('verify_res_ebank', True),
+                    'e_bank': bs_info.get('e_bank', False)
                 }
             )
         return res

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

@@ -3275,7 +3275,15 @@ def fsm_compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=
                                            is_ca, is_cms))
     # 调用java fsm 比对流程接口（http）
     # 调用Java fsm 比对流程接口, fsm 是se流程, ca可以暂时忽略
+    auto_class = HILAutoSettlement if application_entity == consts.HIL_PREFIX else AFCAutoSettlement
+    auto_obj = auto_class.objects.filter(application_id=application_id, on_off=True).first()
+    if auto_obj is not None:
+        url = conf.FSM_AUTO_URL
+        is_auto = True
+    else:
         url = conf.FSM_URL
+        is_auto = False
+    
     body = {
             'applicationId': application_id,
             'businessType': application_entity,
@@ -3284,7 +3292,7 @@ def fsm_compare(application_id, application_entity, uniq_seq, ocr_res_id, is_ca=
             'isCms': is_cms
     }
     try:
-        compare_log.info("request java fsm api, url:{0}, body:{1}".format(url, json.dumps(body)))
+        compare_log.info("request java fsm api, url:{0}, body:{1}, is_auto:{2}".format(url, json.dumps(body), is_auto))
         headers = {
             'Content-Type': 'application/json'
         }