add img count

@@ -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 = '未知卡号'

@@ -310,13 +310,15 @@ class BSWorkbook(Workbook):
                         month_mapping.setdefault(item, []).append(
                         month_mapping.setdefault(item, []).append(
                             (ws.title, idx_list[i] + min_row, idx_list[i + 1] + min_row - 1, day_mean))
                             (ws.title, idx_list[i] + min_row, idx_list[i + 1] + min_row - 1, day_mean))
 
 
-    def build_metadata_rows(self, confidence, code, print_time, start_date, end_date):
+    def build_metadata_rows(self, confidence, code, print_time, start_date, end_date, res_count_tuple):
         if start_date is None or end_date is None:
         if start_date is None or end_date is None:
             timedelta = None
             timedelta = None
         else:
         else:
             timedelta = (end_date - start_date).days
             timedelta = (end_date - start_date).days
         metadata_rows = [
         metadata_rows = [
             ('流水识别置信度', confidence),
             ('流水识别置信度', confidence),
+            ('图片总数', res_count_tuple[0]),
+            ('识别成功', res_count_tuple[1]),
             self.blank_row,
             self.blank_row,
             self.code_header,
             self.code_header,
         ]
         ]
@@ -330,8 +332,8 @@ class BSWorkbook(Workbook):
         )
         )
         return metadata_rows
         return metadata_rows
 
 
-    def build_meta_sheet(self, role_name, card, confidence, code, print_time, start_date, end_date):
-        metadata_rows = self.build_metadata_rows(confidence, code, print_time, start_date, end_date)
+    def build_meta_sheet(self, role_name, card, confidence, code, print_time, start_date, end_date, res_count_tuple):
+        metadata_rows = self.build_metadata_rows(confidence, code, print_time, start_date, end_date, res_count_tuple)
         if not isinstance(role_name, str):
         if not isinstance(role_name, str):
             role_name = consts.UNKNOWN_ROLE
             role_name = consts.UNKNOWN_ROLE
         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))
@@ -595,7 +597,7 @@ class BSWorkbook(Workbook):
             ms.append(row)
             ms.append(row)
         self.remove(tmp2_ws)
         self.remove(tmp2_ws)
 
 
-    def bs_rebuild(self, bs_summary):
+    def bs_rebuild(self, bs_summary, res_count_tuple):
         # bs_summary = {
         # bs_summary = {
         #     '卡号': {
         #     '卡号': {
         #         'classify': 0,
         #         'classify': 0,
@@ -656,7 +658,8 @@ class BSWorkbook(Workbook):
                                        summary.get('code'),
                                        summary.get('code'),
                                        summary.get('print_time'),
                                        summary.get('print_time'),
                                        start_date,
                                        start_date,
-                                       end_date)
+                                       end_date,
+                                       res_count_tuple)
 
 
             # 3.创建月份表、提取/高亮关键行
             # 3.创建月份表、提取/高亮关键行
             # 倒序处理
             # 倒序处理
@@ -737,21 +740,35 @@ class BSWorkbook(Workbook):
             res_list.sort(key=lambda x: (x[0], x[1], x[2]))
             res_list.sort(key=lambda x: (x[0], x[1], x[2]))
             ws = self.create_sheet(consts.RES_SHEET_NAME)
             ws = self.create_sheet(consts.RES_SHEET_NAME)
             ws.append(consts.RES_SHEET_HEADER)
             ws.append(consts.RES_SHEET_HEADER)
+            success_count = 0
             for res_tuple in res_list:
             for res_tuple in res_list:
+                if res_tuple[-1] not in consts.RES_FAILED_SET:
+                    success_count += 1
                 ws.append(res_tuple)
                 ws.append(res_tuple)
+            return len(res_list), success_count
+        else:
+            return 0, 0
+
+    def move_res_sheet(self):
+        sheet = self.get_sheet_by_name(consts.RES_SHEET_NAME)
+        idx = self._sheets.index(sheet)
+        del self._sheets[idx]
+        self._sheets.append(sheet)
 
 
     def remove_base_sheet(self):
     def remove_base_sheet(self):
         if len(self.sheetnames) > 1:
         if len(self.sheetnames) > 1:
             self.remove(self.get_sheet_by_name('Sheet'))
             self.remove(self.get_sheet_by_name('Sheet'))
 
 
     def rebuild(self, bs_summary, license_summary, res_list, document_scheme):
     def rebuild(self, bs_summary, license_summary, res_list, document_scheme):
+        res_count_tuple = self.res_sheet(res_list)
+
         count_list = [(consts.MODEL_FIELD_BS, len(bs_summary))]
         count_list = [(consts.MODEL_FIELD_BS, len(bs_summary))]
         if document_scheme == consts.DOC_SCHEME_LIST[1]:
         if document_scheme == consts.DOC_SCHEME_LIST[1]:
             self.license_rebuild(license_summary, document_scheme, count_list)
             self.license_rebuild(license_summary, document_scheme, count_list)
-            self.bs_rebuild(bs_summary)
+            self.bs_rebuild(bs_summary, res_count_tuple)
         else:
         else:
-            self.bs_rebuild(bs_summary)
+            self.bs_rebuild(bs_summary, res_count_tuple)
             self.license_rebuild(license_summary, document_scheme, count_list)
             self.license_rebuild(license_summary, document_scheme, count_list)
-        self.res_sheet(res_list)
+        self.move_res_sheet()
         self.remove_base_sheet()
         self.remove_base_sheet()
         return count_list
         return count_list