Merge branch 'feature/enhancement-file-name-change' into feature/uat-tmp
Showing
1 changed file
with
18 additions
and
18 deletions
| ... | @@ -39,17 +39,17 @@ class BSWorkbook(Workbook): | ... | @@ -39,17 +39,17 @@ class BSWorkbook(Workbook): | 
| 39 | self.MAX_MEAN = 31 | 39 | self.MAX_MEAN = 31 | 
| 40 | self.need_follow = False | 40 | self.need_follow = False | 
| 41 | 41 | ||
| 42 | @staticmethod | 42 | # @staticmethod | 
| 43 | def date_calibration(date_str): | 43 | # def date_calibration(date_str): | 
| 44 | result = True | 44 | # result = True | 
| 45 | try: | 45 | # try: | 
| 46 | if date_str[-2] not in ['20', '21']: | 46 | # if date_str[-2] not in ['20', '21']: | 
| 47 | result = False | 47 | # result = False | 
| 48 | if date_str[-5:-3] not in ['03', '06', '09', '12']: | 48 | # if date_str[-5:-3] not in ['03', '06', '09', '12']: | 
| 49 | result = False | 49 | # result = False | 
| 50 | except Exception as e: | 50 | # except Exception as e: | 
| 51 | result = False | 51 | # result = False | 
| 52 | return result | 52 | # return result | 
| 53 | 53 | ||
| 54 | @staticmethod | 54 | @staticmethod | 
| 55 | def replace_newline(queryset_value): | 55 | def replace_newline(queryset_value): | 
| ... | @@ -673,13 +673,13 @@ class BSWorkbook(Workbook): | ... | @@ -673,13 +673,13 @@ class BSWorkbook(Workbook): | 
| 673 | # 关键词1信息提取:结息 | 673 | # 关键词1信息提取:结息 | 
| 674 | for row in tmp3_ws.iter_rows(values_only=True): | 674 | for row in tmp3_ws.iter_rows(values_only=True): | 
| 675 | ms.append(row) | 675 | ms.append(row) | 
| 676 | # 建设银行 | 676 | # # 建设银行 | 
| 677 | if classify in consts.JSYH_CLASSIFY: | 677 | # if classify in consts.JSYH_CLASSIFY: | 
| 678 | if isinstance(row[1], str) and self.date_calibration(row[1]): | 678 | # if isinstance(row[1], str) and self.date_calibration(row[1]): | 
| 679 | pass | 679 | # pass | 
| 680 | else: | 680 | # else: | 
| 681 | for cell in ms[ms.max_row]: | 681 | # for cell in ms[ms.max_row]: | 
| 682 | cell.fill = self.amount_fill | 682 | # cell.fill = self.amount_fill | 
| 683 | self.remove(tmp3_ws) | 683 | self.remove(tmp3_ws) | 
| 684 | 684 | ||
| 685 | # 关键词2信息提取 | 685 | # 关键词2信息提取 | ... | ... | 
- 
Please register or sign in to post a comment