fix bug
Showing
1 changed file
with
5 additions
and
11 deletions
... | @@ -168,7 +168,7 @@ class BSWorkbook(Workbook): | ... | @@ -168,7 +168,7 @@ class BSWorkbook(Workbook): |
168 | month_mapping.setdefault(month_list[-1], []).insert( | 168 | month_mapping.setdefault(month_list[-1], []).insert( |
169 | 0, (ws.title, idx_list[-1] + min_row, ws.max_row, 0)) | 169 | 0, (ws.title, idx_list[-1] + min_row, ws.max_row, 0)) |
170 | 170 | ||
171 | def build_metadata_rows(self, classify, confidence, role, code, print_time, start_date, end_date): | 171 | def build_metadata_rows(self, confidence, code, print_time, start_date, end_date): |
172 | if start_date is None or end_date is None: | 172 | if start_date is None or end_date is None: |
173 | timedelta = None | 173 | timedelta = None |
174 | else: | 174 | else: |
... | @@ -176,10 +176,6 @@ class BSWorkbook(Workbook): | ... | @@ -176,10 +176,6 @@ class BSWorkbook(Workbook): |
176 | metadata_rows = [ | 176 | metadata_rows = [ |
177 | ('流水识别置信度', confidence), | 177 | ('流水识别置信度', confidence), |
178 | self.blank_row, | 178 | self.blank_row, |
179 | ('分类结果', classify), | ||
180 | self.blank_row, | ||
181 | ('户名', role), | ||
182 | self.blank_row, | ||
183 | self.code_header, | 179 | self.code_header, |
184 | ] | 180 | ] |
185 | metadata_rows.extend(code) | 181 | metadata_rows.extend(code) |
... | @@ -200,19 +196,19 @@ class BSWorkbook(Workbook): | ... | @@ -200,19 +196,19 @@ class BSWorkbook(Workbook): |
200 | ms = self.create_sheet('{0}({1})'.format(self.meta_sheet_title, card)) | 196 | ms = self.create_sheet('{0}({1})'.format(self.meta_sheet_title, card)) |
201 | return ms | 197 | return ms |
202 | 198 | ||
203 | def build_meta_sheet(self, card, classify, confidence, role, code, print_time, start_date, end_date): | 199 | def build_meta_sheet(self, card, confidence, code, print_time, start_date, end_date): |
204 | metadata_rows = self.build_metadata_rows(classify, confidence, role, code, print_time, start_date, end_date) | 200 | metadata_rows = self.build_metadata_rows(confidence, code, print_time, start_date, end_date) |
205 | ms = self.create_meta_sheet(card) | 201 | ms = self.create_meta_sheet(card) |
206 | for row in metadata_rows: | 202 | for row in metadata_rows: |
207 | ms.append(row) | 203 | ms.append(row) |
208 | return ms | 204 | return ms |
209 | 205 | ||
210 | def build_month_sheet(self, role, month_mapping, ms, is_reverse): | 206 | def build_month_sheet(self, card, month_mapping, ms, is_reverse): |
211 | tmp_ws = self.create_sheet('tmp_ws') | 207 | tmp_ws = self.create_sheet('tmp_ws') |
212 | for month in sorted(month_mapping.keys()): | 208 | for month in sorted(month_mapping.keys()): |
213 | # 3.1.拷贝数据 | 209 | # 3.1.拷贝数据 |
214 | parts = month_mapping.get(month) | 210 | parts = month_mapping.get(month) |
215 | new_ws = self.create_sheet('{0}({1})'.format(month, role)) | 211 | new_ws = self.create_sheet('{0}({1})'.format(month, card[-6:])) |
216 | new_ws.append(consts.FIXED_HEADERS) | 212 | new_ws.append(consts.FIXED_HEADERS) |
217 | for part in parts: | 213 | for part in parts: |
218 | ws = self.get_sheet_by_name(part[0]) | 214 | ws = self.get_sheet_by_name(part[0]) |
... | @@ -338,9 +334,7 @@ class BSWorkbook(Workbook): | ... | @@ -338,9 +334,7 @@ class BSWorkbook(Workbook): |
338 | 334 | ||
339 | # 2.元信息提取表 | 335 | # 2.元信息提取表 |
340 | ms = self.build_meta_sheet(card, | 336 | ms = self.build_meta_sheet(card, |
341 | summary['classify'], | ||
342 | summary['confidence'], | 337 | summary['confidence'], |
343 | summary['role'], | ||
344 | summary['code'], | 338 | summary['code'], |
345 | summary['print_time'], | 339 | summary['print_time'], |
346 | start_date, | 340 | start_date, | ... | ... |
-
Please register or sign in to post a comment