fix bug

@@ -902,6 +902,7 @@ NYYH_CLASSIFY = 17
 MS_CLASSIFY = 21
 MS_CLASSIFY = 21
 MS_ERROR_COL = (5, 6)
 MS_ERROR_COL = (5, 6)
 WECHART_CLASSIFY = 12
 WECHART_CLASSIFY = 12
+ALI_WECHART_CLASSIFY = {12, 13}
 WECHART_ERROR_COL = (1, 2)
 WECHART_ERROR_COL = (1, 2)
 WECHART_HEADERS_MAPPING = copy.deepcopy(HEADERS_MAPPING)
 WECHART_HEADERS_MAPPING = copy.deepcopy(HEADERS_MAPPING)
 WECHART_HEADERS_MAPPING.update(
 WECHART_HEADERS_MAPPING.update(

@@ -91,7 +91,7 @@ class Command(BaseCommand, LoggerMixin):
                     else:
                     else:
                         res_list.append((pno, ino, part_idx, consts.RES_FAILED))
                         res_list.append((pno, ino, part_idx, consts.RES_FAILED))
 
 
-                wb = BSWorkbook(set(), set(), set())
+                wb = BSWorkbook(set(), set(), set(), set())
                 wb.simple_license_rebuild(license_summary, consts.DOC_SCHEME_LIST[0])
                 wb.simple_license_rebuild(license_summary, consts.DOC_SCHEME_LIST[0])
                 wb.save(excel_path)
                 wb.save(excel_path)
         except Exception as e:
         except Exception as e:

@@ -489,9 +489,10 @@ class Command(BaseCommand, LoggerMixin):
                     salary_keyword = Keywords.objects.filter(
                     salary_keyword = Keywords.objects.filter(
                         type=KeywordsType.SALARY.value, on_off=True).values_list('keyword', flat=True)
                         type=KeywordsType.SALARY.value, on_off=True).values_list('keyword', flat=True)
                     loan_keyword = Keywords.objects.filter(
                     loan_keyword = Keywords.objects.filter(
-                        type__in=[KeywordsType.LOAN.value, KeywordsType.ALI_WECHART.value], on_off=True).values_list(
-                        'keyword', flat=True)
-                    wb = BSWorkbook(interest_keyword, salary_keyword, loan_keyword)
+                        type=KeywordsType.LOAN.value, on_off=True).values_list('keyword', flat=True)
+                    wechat_keyword = Keywords.objects.filter(
+                        type=KeywordsType.ALI_WECHART.value, on_off=True).values_list('keyword', flat=True)
+                    wb = BSWorkbook(interest_keyword, salary_keyword, loan_keyword, wechat_keyword)
                     for img_path, res in ocr_1_res.items():
                     for img_path, res in ocr_1_res.items():
                         pno, ino = self.parse_img_path(img_path)
                         pno, ino = self.parse_img_path(img_path)
                         part_idx = 1
                         part_idx = 1

@@ -13,7 +13,7 @@ from apps.doc import consts
 
 
 class BSWorkbook(Workbook):
 class BSWorkbook(Workbook):
 
 
-    def __init__(self, interest_keyword, salary_keyword, loan_keyword, *args, **kwargs):
+    def __init__(self, interest_keyword, salary_keyword, loan_keyword, wechat_keyword, *args, **kwargs):
         super().__init__(*args, **kwargs)
         super().__init__(*args, **kwargs)
         locale.setlocale(locale.LC_NUMERIC, 'en_US.UTF-8')
         locale.setlocale(locale.LC_NUMERIC, 'en_US.UTF-8')
         self.meta_sheet_title = '关键信息提取和展示'
         self.meta_sheet_title = '关键信息提取和展示'
@@ -24,6 +24,7 @@ class BSWorkbook(Workbook):
         self.interest_keyword = interest_keyword
         self.interest_keyword = interest_keyword
         self.salary_keyword = salary_keyword
         self.salary_keyword = salary_keyword
         self.loan_keyword = loan_keyword
         self.loan_keyword = loan_keyword
+        self.wechat_keyword = wechat_keyword
         self.proof_res = ('对', '错')
         self.proof_res = ('对', '错')
         self.loan_fill = PatternFill("solid", fgColor="00FFCC00")
         self.loan_fill = PatternFill("solid", fgColor="00FFCC00")
         self.amount_fill = PatternFill("solid", fgColor="00FFFF00")
         self.amount_fill = PatternFill("solid", fgColor="00FFFF00")
@@ -309,6 +310,7 @@ class BSWorkbook(Workbook):
                 else:  # 364,92
                 else:  # 364,92
                     pre_idx = period_idx
                     pre_idx = period_idx
                 res_str = '{0}.{1}'.format(res_str[:pre_idx], res_str[period_idx + 1:])
                 res_str = '{0}.{1}'.format(res_str[:pre_idx], res_str[period_idx + 1:])
+            res_str = res_str[:period_idx].replace('.', '') + res_str[period_idx:]
         return res_str
         return res_str
 
 
     @staticmethod
     @staticmethod
@@ -372,6 +374,10 @@ class BSWorkbook(Workbook):
         result_idx = len(header) - 1
         result_idx = len(header) - 1
 
 
         tmp_ws = self.create_sheet('tmp_ws')
         tmp_ws = self.create_sheet('tmp_ws')
+        if classify in consts.ALI_WECHART_CLASSIFY:
+            high_light_keyword = self.wechat_keyword
+        else:
+            high_light_keyword = self.loan_keyword
         for month in sorted(month_mapping.keys()):
         for month in sorted(month_mapping.keys()):
             # 3.1.拷贝数据
             # 3.1.拷贝数据
             parts = month_mapping.get(month)
             parts = month_mapping.get(month)
@@ -419,7 +425,7 @@ class BSWorkbook(Workbook):
                     elif summary_cell_value in self.salary_keyword:
                     elif summary_cell_value in self.salary_keyword:
                         tmp_ws.append((summary_cell_value, date_cell_value, amount_cell_value))
                         tmp_ws.append((summary_cell_value, date_cell_value, amount_cell_value))
                     # 贷款关键词高亮
                     # 贷款关键词高亮
-                    elif summary_cell_value in self.loan_keyword:
+                    elif summary_cell_value in high_light_keyword:
                         summary_cell.fill = self.amount_fill
                         summary_cell.fill = self.amount_fill
                         if amount_cell is not None:
                         if amount_cell is not None:
                             amount_cell.fill = self.amount_fill
                             amount_cell.fill = self.amount_fill

@@ -456,7 +456,7 @@ afc_sql = """
 """
 """
 
 
 keywords_sql = """
 keywords_sql = """
-    INSERT INTO afc.dbo.keywords (keyword, type, update_time, create_time) VALUES
+    INSERT INTO keywords (keyword, type, update_time, create_time) VALUES
     (N'利息', 0, N'2020-11-09 16:14:58.000', N'2020-11-09 16:14:59.000'),
     (N'利息', 0, N'2020-11-09 16:14:58.000', N'2020-11-09 16:14:59.000'),
     (N'结息', 0, N'2020-11-09 16:14:58.000', N'2020-11-09 16:14:59.000'),
     (N'结息', 0, N'2020-11-09 16:14:58.000', N'2020-11-09 16:14:59.000'),
     (N'工资', 1, N'2020-11-09 16:14:58.000', N'2020-11-09 16:14:59.000'),
     (N'工资', 1, N'2020-11-09 16:14:58.000', N'2020-11-09 16:14:59.000'),