Merge branch 'feature/bs_excel' into feature/0611

@@ -99,6 +99,7 @@ RES_FAILED = '识别失败'
 RES_FAILED_1 = '识别失败(阶段1)'
 RES_FAILED_1 = '识别失败(阶段1)'
 RES_FAILED_2 = '识别失败(阶段2)'
 RES_FAILED_2 = '识别失败(阶段2)'
 RES_FAILED_3 = '识别失败(阶段1数据格式错误)'
 RES_FAILED_3 = '识别失败(阶段1数据格式错误)'
+RES_FAILED_SET = {RES_FAILED, RES_FAILED_1, RES_FAILED_2, RES_FAILED_3}
 
 
 CARD_RATIO = 0.9
 CARD_RATIO = 0.9
 UNKNOWN_CARD = '未知卡号'
 UNKNOWN_CARD = '未知卡号'

@@ -768,7 +768,9 @@ class Command(BaseCommand, LoggerMixin):
                             type=KeywordsType.LOAN.value, on_off=True).values_list('keyword', flat=True)
                             type=KeywordsType.LOAN.value, on_off=True).values_list('keyword', flat=True)
                         wechat_keyword = Keywords.objects.filter(
                         wechat_keyword = Keywords.objects.filter(
                             type=KeywordsType.ALI_WECHART.value, on_off=True).values_list('keyword', flat=True)
                             type=KeywordsType.ALI_WECHART.value, on_off=True).values_list('keyword', flat=True)
-                        wb = BSWorkbook(interest_keyword, salary_keyword, loan_keyword, wechat_keyword)
+                        repayments_keyword = Keywords.objects.filter(
+                            type=KeywordsType.REPAYMENTS.value, on_off=True).values_list('keyword', flat=True)
+                        wb = BSWorkbook(interest_keyword, salary_keyword, loan_keyword, wechat_keyword, repayments_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

@@ -19,6 +19,7 @@ class KeywordsType(NamedEnum):
     SALARY = (1, '薪资')
     SALARY = (1, '薪资')
     LOAN = (2, '贷款')
     LOAN = (2, '贷款')
     ALI_WECHART = (3, '微信/支付宝')
     ALI_WECHART = (3, '微信/支付宝')
+    REPAYMENTS = (4, '还款')
 
 
 
 
 class RequestTeam(NamedEnum):
 class RequestTeam(NamedEnum):