Merge branch 'feature/fsm-contract' into fix/report_ca

@@ -1086,9 +1086,10 @@ CONTRACT_MAP = {
     FSM_CONTRACT_WEP_CLASSIFY: FSM_CONTRACT_WEP_CN_NAME,
     FSM_CONTRACT_WEP_CLASSIFY: FSM_CONTRACT_WEP_CN_NAME,
     FSM_CONTRACT_MSI_CLASSIFY: FSM_CONTRACT_MSI_CN_NAME,
     FSM_CONTRACT_MSI_CLASSIFY: FSM_CONTRACT_MSI_CN_NAME,
     FSM_CONTRACT_SC_CLASSIFY: FSM_CONTRACT_SC_CN_NAME, 
     FSM_CONTRACT_SC_CLASSIFY: FSM_CONTRACT_SC_CN_NAME, 
-
 }
 }
 
 
+FSM_CONTRACT_CLASSIFY_SET = {FSM_CONTRACT_WEP_CLASSIFY, FSM_CONTRACT_MSI_CLASSIFY, FSM_CONTRACT_SC_CLASSIFY}
+
 # 保单
 # 保单
 INSURANCE_CN_NAME = '保单'
 INSURANCE_CN_NAME = '保单'
 INSURANCE_CLASSIFY = 42
 INSURANCE_CLASSIFY = 42

@@ -780,10 +780,12 @@ class BSWorkbook(Workbook):
             if field_str is not None:
             if field_str is not None:
                 count_list.append((field_str, count))
                 count_list.append((field_str, count))
 
 
-    def contract_rebuild(self, contract_result_dict):
+    def contract_rebuild(self, contract_result_dict, is_ca=False):
         for classify, contract_result in contract_result_dict.items():
         for classify, contract_result in contract_result_dict.items():
             if len(contract_result) == 0:
             if len(contract_result) == 0:
                 continue
                 continue
+            if is_ca and classify not in consts.FSM_CONTRACT_CLASSIFY_SET:
+                continue
             ws = self.create_sheet(consts.CONTRACT_MAP.get(classify))
             ws = self.create_sheet(consts.CONTRACT_MAP.get(classify))
             for i in range(30):
             for i in range(30):
                 if str(i) in contract_result:
                 if str(i) in contract_result:
@@ -906,6 +908,7 @@ class BSWorkbook(Workbook):
         else:
         else:
             self.bs_rebuild(bs_summary, res_count_tuple, metadata)
             self.bs_rebuild(bs_summary, res_count_tuple, metadata)
             self.license_rebuild(license_summary, document_scheme, count_list)
             self.license_rebuild(license_summary, document_scheme, count_list)
+            self.contract_rebuild(contract_result, True)
         self.move_res_sheet()
         self.move_res_sheet()
         self.remove_base_sheet()
         self.remove_base_sheet()
         return count_list
         return count_list