1a89d0da by 周伟奇

SE logic modify

1 parent bedc2671
...@@ -540,7 +540,7 @@ class BSWorkbook(Workbook): ...@@ -540,7 +540,7 @@ class BSWorkbook(Workbook):
540 row_num = 2 540 row_num = 2
541 for cell in rows: 541 for cell in rows:
542 row_num = cell.row 542 row_num = cell.row
543 if isinstance(cell.value, str) and cell.value.find(role_name) != -1: 543 if isinstance(cell.value, str) and cell.value.find(role_name) != -1 and summary_cell is not None:
544 fill_row.add(summary_cell.row) 544 fill_row.add(summary_cell.row)
545 break 545 break
546 546
...@@ -666,7 +666,9 @@ class BSWorkbook(Workbook): ...@@ -666,7 +666,9 @@ class BSWorkbook(Workbook):
666 new_card = self.get_new_card(card) 666 new_card = self.get_new_card(card)
667 # 1.原表表头收集、按照月份分割 667 # 1.原表表头收集、按照月份分割
668 # 1.1 总结首行信息 668 # 1.1 总结首行信息
669 role_name = summary.get('role', consts.UNKNOWN_ROLE).translate(consts.SHEET_TITLE_TRANS).strip()[:3] 669 src_role_name = summary.get('role', consts.UNKNOWN_ROLE)
670 role_name = src_role_name.translate(consts.SHEET_TITLE_TRANS).strip()[:3] if isinstance(src_role_name, str)\
671 else consts.UNKNOWN_ROLE
670 classify = summary.get('classify', 0) 672 classify = summary.get('classify', 0)
671 sheet_header_info = {} 673 sheet_header_info = {}
672 header_info = {} 674 header_info = {}
......
...@@ -1269,8 +1269,8 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True): ...@@ -1269,8 +1269,8 @@ def get_se_cms_compare_info_auto(last_obj, application_entity, auto=True):
1269 (consts.SE_HIL_CON_3_FIELD[5], hmh_name), 1269 (consts.SE_HIL_CON_3_FIELD[5], hmh_name),
1270 (consts.SE_HIL_CON_3_FIELD[6], hmh_id), 1270 (consts.SE_HIL_CON_3_FIELD[6], hmh_id),
1271 ] 1271 ]
1272 if online_sign: 1272 # if online_sign:
1273 hil_contract_3_input.append((consts.SE_HIL_CON_3_FIELD[7], hmh_name)) 1273 # hil_contract_3_input.append((consts.SE_HIL_CON_3_FIELD[7], hmh_name))
1274 contract_info[consts.HIL_CONTRACT_3_EN] = hil_contract_3_input 1274 contract_info[consts.HIL_CONTRACT_3_EN] = hil_contract_3_input
1275 1275
1276 # HIL合同 车辆租赁抵押合同 -------------------------------------------------------------------------------------- 1276 # HIL合同 车辆租赁抵押合同 --------------------------------------------------------------------------------------
...@@ -1552,18 +1552,18 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals ...@@ -1552,18 +1552,18 @@ def get_se_cms_compare_info(last_obj, application_entity, detect_list, auto=Fals
1552 bank_info[consts.BC_EN] = bank_field_input 1552 bank_info[consts.BC_EN] = bank_field_input
1553 1553
1554 # DDA------------------------------------------------------------------------------------------------------------ 1554 # DDA------------------------------------------------------------------------------------------------------------
1555 if is_gsyh or not detect_list[-1]: 1555 # if is_gsyh or not detect_list[-1]:
1556 dda_field_input = [ 1556 # dda_field_input = [
1557 ('applicationId(1)', last_obj.application_id), 1557 # ('applicationId(1)', last_obj.application_id),
1558 ('applicationId(2)', last_obj.application_id), 1558 # ('applicationId(2)', last_obj.application_id),
1559 ('bankName', bank_name), 1559 # ('bankName', bank_name),
1560 ('companyName', consts.HIL_COMPANY_NAME if application_entity in consts.HIL_SET else consts.AFC_COMPANY_NAME), 1560 # ('companyName', consts.HIL_COMPANY_NAME if application_entity in consts.HIL_SET else consts.AFC_COMPANY_NAME),
1561 ('customerName', dda_name), 1561 # ('customerName', dda_name),
1562 ('idNum', dda_num), 1562 # ('idNum', dda_num),
1563 ('accountHolderName', account_holder_name), 1563 # ('accountHolderName', account_holder_name),
1564 ('accountNo', account_no), 1564 # ('accountNo', account_no),
1565 ] 1565 # ]
1566 bank_info[consts.DDA_EN] = dda_field_input 1566 # bank_info[consts.DDA_EN] = dda_field_input
1567 if len(bank_info) > 0: 1567 if len(bank_info) > 0:
1568 compare_info['bankInfo'] = bank_info 1568 compare_info['bankInfo'] = bank_info
1569 1569
......
...@@ -130,7 +130,7 @@ class IWABaseView: ...@@ -130,7 +130,7 @@ class IWABaseView:
130 def get_q_number(self, iwa_url_base, code, redirect_uri, client_id_base64): 130 def get_q_number(self, iwa_url_base, code, redirect_uri, client_id_base64):
131 access_token = self.get_token(iwa_url_base, code, redirect_uri, client_id_base64) 131 access_token = self.get_token(iwa_url_base, code, redirect_uri, client_id_base64)
132 headers = { 132 headers = {
133 'Authorization', 'Bearer {0}'.format(access_token) 133 'Authorization': 'Bearer {0}'.format(access_token)
134 } 134 }
135 iwa_user_url = '{0}userinfo'.format(iwa_url_base) 135 iwa_user_url = '{0}userinfo'.format(iwa_url_base)
136 res = requests.get(iwa_user_url, headers=headers) 136 res = requests.get(iwa_user_url, headers=headers)
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!