Merge branch 'feature/bs_excel' into feature/0611

@@ -339,6 +339,11 @@ class BSWorkbook(Workbook):
         ms = self.create_sheet('{0}{1}({2})'.format(self.meta_sheet_title, role_name, card))
         ms = self.create_sheet('{0}{1}({2})'.format(self.meta_sheet_title, role_name, card))
         for row in metadata_rows:
         for row in metadata_rows:
             ms.append(row)
             ms.append(row)
+        if res_count_tuple[0] != res_count_tuple[1]:
+            for cell in ms[2]:
+                cell.fill = self.amount_fill
+            for cell in ms[3]:
+                cell.fill = self.amount_fill
         return ms
         return ms
 
 
     @staticmethod
     @staticmethod
@@ -419,14 +424,20 @@ class BSWorkbook(Workbook):
             for i in range(max_column - src_header_len):
             for i in range(max_column - src_header_len):
                 header.append(None)
                 header.append(None)
 
 
-        add_col = ['核对结果', '合计']
+        # 3.6 金额合计列
+        add_col = ['核对结果']
         if amount_cell_idx is None:
         if amount_cell_idx is None:
             if income_cell_idx is not None or outlay_cell_idx is not None:
             if income_cell_idx is not None or outlay_cell_idx is not None:
-                add_col = ['金额', '核对结果', '合计']
+                add_col = ['金额', '核对结果']
                 amount_cell_idx = len(header)
                 amount_cell_idx = len(header)
+
+        amount_col_letter = get_column_letter(amount_cell_idx + 1) if isinstance(amount_cell_idx, int) else None
+        amount_sum = '=SUBTOTAL(9,{0}:{0})'.format(amount_col_letter) if isinstance(amount_cell_idx, int) else ''
+        add_col.append('合计')
+        add_col.append(amount_sum)
+
         header.extend(add_col)
         header.extend(add_col)
-        result_idx = len(header) - 2
-        amount_sum_idx = len(header) - 1
+        result_idx = len(header) - 3
 
 
         tmp_ws = self.create_sheet('tmp_ws')
         tmp_ws = self.create_sheet('tmp_ws')
         tmp2_ws = self.create_sheet('tmp2_ws')
         tmp2_ws = self.create_sheet('tmp2_ws')
@@ -484,7 +495,7 @@ class BSWorkbook(Workbook):
                 row_num = 2
                 row_num = 2
                 for cell in rows:
                 for cell in rows:
                     row_num = cell.row
                     row_num = cell.row
-                    if cell.value == role_name:
+                    if isinstance(cell.value, str) and cell.value.find(role_name) != -1:
                         fill_row.add(summary_cell.row)
                         fill_row.add(summary_cell.row)
                         break
                         break
 
 
@@ -534,7 +545,6 @@ class BSWorkbook(Workbook):
                                     amount_cell.value, set()).add(amount_cell.row)
                                     amount_cell.value, set()).add(amount_cell.row)
 
 
                 # 3.5.核对结果
                 # 3.5.核对结果
-                amount_col_letter = get_column_letter(amount_cell_idx + 1)
                 if amount_success and over_success and amount_cell.row > 2:
                 if amount_success and over_success and amount_cell.row > 2:
                     over_col_letter = get_column_letter(over_cell_idx + 1)
                     over_col_letter = get_column_letter(over_cell_idx + 1)
                     if is_reverse:
                     if is_reverse:
@@ -544,11 +554,6 @@ class BSWorkbook(Workbook):
                         rows[result_idx].value = '=IF({2}{0}=ROUND(SUM({2}{1},{3}{0}),4), "{4}", "{5}")'.format(
                         rows[result_idx].value = '=IF({2}{0}=ROUND(SUM({2}{1},{3}{0}),4), "{4}", "{5}")'.format(
                             amount_cell.row, amount_cell.row - 1, over_col_letter, amount_col_letter, *self.proof_res)
                             amount_cell.row, amount_cell.row - 1, over_col_letter, amount_col_letter, *self.proof_res)
 
 
-                # 3.6 金额合计列
-                amount_sum_letter = get_column_letter(amount_sum_idx + 1)
-                rows[amount_sum_idx].value = '=SUM({0}{1},{2}{3})'.format(
-                    amount_sum_letter, row_num - 1, amount_col_letter, row_num)
-
                 # 3.2.提取信息、高亮
                 # 3.2.提取信息、高亮
                 # row = summary_cell.row
                 # row = summary_cell.row
                 if summary_cell is not None:
                 if summary_cell is not None: