purne back

@@ -871,7 +871,7 @@ class Command(BaseCommand, LoggerMixin):
                             # 重构Excel文件
                             # 重构Excel文件
                             # src_excel_path = os.path.join(doc_data_path, 'src.xlsx')
                             # src_excel_path = os.path.join(doc_data_path, 'src.xlsx')
                             # wb.save(src_excel_path)
                             # wb.save(src_excel_path)
-                            wb.rebuild(merged_bs_summary, license_summary, res_list, doc.document_scheme)
+                            count_list = wb.rebuild(merged_bs_summary, license_summary, res_list, doc.document_scheme)
                             wb.save(excel_path)
                             wb.save(excel_path)
 
 
                         except Exception as e:
                         except Exception as e:
@@ -918,9 +918,9 @@ class Command(BaseCommand, LoggerMixin):
                                 try:
                                 try:
                                     doc.end_time = timezone.now()
                                     doc.end_time = timezone.now()
                                     doc.duration = min((doc.end_time - doc.start_time).seconds, 32760)
                                     doc.duration = min((doc.end_time - doc.start_time).seconds, 32760)
-                                    # for field, count in count_list:
-                                    #     if hasattr(doc, field):
-                                    #         setattr(doc, field, count)
+                                    for field, count in count_list:
+                                        if hasattr(doc, field):
+                                            setattr(doc, field, count)
                                     doc.save()
                                     doc.save()
                                 except Exception as e:
                                 except Exception as e:
                                     self.online_log.error('{0} [process error (db save)] [task={1}] [error={2}]'.format(
                                     self.online_log.error('{0} [process error (db save)] [task={1}] [error={2}]'.format(

@@ -633,12 +633,12 @@ class BSWorkbook(Workbook):
             for sheet in sheets_list:
             for sheet in sheets_list:
                 self.remove(self.get_sheet_by_name(sheet))
                 self.remove(self.get_sheet_by_name(sheet))
 
 
-    def license_rebuild(self, license_summary, document_scheme):
-        for classify, (_, name, field_order, side_diff, scheme_diff, _) in consts.LICENSE_ORDER:
+    def license_rebuild(self, license_summary, document_scheme, count_list):
+        for classify, (_, name, field_order, side_diff, scheme_diff, field_str) in consts.LICENSE_ORDER:
             license_list = license_summary.get(classify)
             license_list = license_summary.get(classify)
             if not license_list:
             if not license_list:
                 continue
                 continue
-            # count = 0
+            count = 0
             ws = self.create_sheet(name)
             ws = self.create_sheet(name)
             if scheme_diff and document_scheme == consts.DOC_SCHEME_LIST[1]:
             if scheme_diff and document_scheme == consts.DOC_SCHEME_LIST[1]:
                 classify = consts.MVC_CLASSIFY_SE
                 classify = consts.MVC_CLASSIFY_SE
@@ -653,8 +653,8 @@ class BSWorkbook(Workbook):
                     else:
                     else:
                         ws.append((write_field, field_value))
                         ws.append((write_field, field_value))
                 ws.append((None, ))
                 ws.append((None, ))
-                # count += 1
-            # count_list.append((field_str, count))
+                count += 1
+            count_list.append((field_str, count))
 
 
     def simple_license_rebuild(self, license_summary, document_scheme):
     def simple_license_rebuild(self, license_summary, document_scheme):
         # for ic_license_dict in license_summary.get(consts.IC_CLASSIFY, []):
         # for ic_license_dict in license_summary.get(consts.IC_CLASSIFY, []):
@@ -708,13 +708,13 @@ class BSWorkbook(Workbook):
             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):
-        # count_list = [(consts.MODEL_FIELD_BS, len(self.sheetnames) - 1)]
+        count_list = [(consts.MODEL_FIELD_BS, len(self.sheetnames) - 1)]
         if document_scheme == consts.DOC_SCHEME_LIST[1]:
         if document_scheme == consts.DOC_SCHEME_LIST[1]:
-            self.license_rebuild(license_summary, document_scheme)
+            self.license_rebuild(license_summary, document_scheme, count_list)
             self.bs_rebuild(bs_summary)
             self.bs_rebuild(bs_summary)
         else:
         else:
             self.bs_rebuild(bs_summary)
             self.bs_rebuild(bs_summary)
-            self.license_rebuild(license_summary, document_scheme)
+            self.license_rebuild(license_summary, document_scheme, count_list)
         self.res_sheet(res_list)
         self.res_sheet(res_list)
         self.remove_base_sheet()
         self.remove_base_sheet()
-        # return count_list
+        return count_list