Merge branch 'feature/contract' into feature/0918

@@ -209,7 +209,7 @@ class Command(BaseCommand, LoggerMixin):
 
 
     def contract_process(self, ocr_data, contract_result, res_list, pno, ino, part_idx, img_path):
     def contract_process(self, ocr_data, contract_result, res_list, pno, ino, part_idx, img_path):
         contract_dict = ocr_data.get('data')
         contract_dict = ocr_data.get('data')
-        if not contract_dict or 'page_num' not in contract_dict or 'page_info' not in contract_dict:
+        if not contract_dict or contract_dict.get('page_num') is None or  contract_dict.get('page_info') is None:
             res_list.append((pno, ino, part_idx, consts.RES_SUCCESS_EMPTY))
             res_list.append((pno, ino, part_idx, consts.RES_SUCCESS_EMPTY))
             return
             return
         res_list.append((pno, ino, part_idx, consts.RES_SUCCESS))
         res_list.append((pno, ino, part_idx, consts.RES_SUCCESS))

@@ -706,12 +706,16 @@ class BSWorkbook(Workbook):
         if len(contract_result) == 0:
         if len(contract_result) == 0:
             return
             return
         ws = self.create_sheet(consts.CONTRACT_SHEET_NAME)
         ws = self.create_sheet(consts.CONTRACT_SHEET_NAME)
-        for page_num, info_list in contract_result.items():
-            ws.append(('page {0}'.format(page_num), ))
-            for info in info_list:
-                for row in info:
-                    ws.append(row)
-            ws.append((None, ))
+        for i in range(15):
+            if str(i) in contract_result:
+                page_num = str(i)
+                info_list = contract_result.get(page_num)
+        # for page_num, info_list in contract_result.items():
+                ws.append(('page {0}'.format(page_num), ))
+                for info in info_list:
+                    for row in info:
+                        ws.append(row)
+                ws.append((None, ))
 
 
     @staticmethod
     @staticmethod
     def remove_yuan(amount_key_set, key, src_str):
     def remove_yuan(amount_key_set, key, src_str):