250218-2代码。

models/three_proofing_responsible_base.py

@@ -102,6 +102,8 @@ class ThreeProofingResponsiblePersonImportFileStatus(Base):
     id = Column(Integer, primary_key=True, autoincrement=True, comment='ID')
     file_uuid = Column(String(255), nullable=False, comment='文件uuid名称')
     file_name = Column(String(255), nullable=False, comment='文件名称')
+    error_num = Column(Integer, nullable=False,default=0, comment='错误数量')
+    warning_num = Column(Integer, nullable=False,default=0,comment='警告数量')
     status = Column(String(50), nullable=False, comment='状态')
     create_time = Column(DateTime, default=datetime.now, comment='创建时间')
     update_time = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='更新时间')

routers/api/ThreeProofingResponsible/import_status.py

@@ -60,6 +60,8 @@ async def get_emergency_contact_list(
                 "id": info.id,
                 "file_uuid": info.file_uuid,
                 "file_name": info.file_name,
+                "warning_num":info.warning_num,
+                "error_num":info.error_num,
                 "status": info.status,
                 "create_time":info.create_time.strftime('%Y-%m-%d %H:%M:%S'),
                 "update_time": info.update_time.strftime('%Y-%m-%d %H:%M:%S'),

routers/api/ThreeProofingResponsible/person.py

@@ -520,6 +520,7 @@ def other_type_string_type_parent_id_create_data(db,string,type_parent_id,file_i
             reslte.append(new_person_type)
         else:
             file_info.remark= file_info.remark+f'\n行<{row+1}>责任类别未找到<{other_type_name}>'
+            file_info.error_num +=1
             return reslte ,False
     return reslte ,True
 def import_data(db,file_path,user_id,file_info):
@@ -530,6 +531,7 @@ def import_data(db,file_path,user_id,file_info):
         sheet = book.sheet_by_index(0)
     except :
         file_info.remark = file_info.remark + f'\n文件打开失败，请核实文件格式为xlsx/xlx>'
+        file_info.error_num +=1
         import_status = False
     data = []
     for row in range(4, sheet.nrows):
@@ -537,23 +539,27 @@ def import_data(db,file_path,user_id,file_info):
         name = sheet.cell(row, 0).value
         if name == '':
             file_info.remark = file_info.remark+f'\n行<{row+1}>姓名不能为空<{name}>'
+            file_info.error_num +=1
             import_status = False
         # 所属单位
         unit_name = sheet.cell(row, 1).value
         if unit_name == '':
             file_info.remark = file_info.remark+f'\n行<{row+1}>所属单位不能为空<{unit_name}>'
+            file_info.error_num +=1
             import_status = False
         unit_id = db_dept.get_dept_id_by_name(db, unit_name)
         # 职务
         position = sheet.cell(row, 2).value
         if position =='':
             file_info.remark = file_info.remark+f'\n行<{row+1}>职务不能为空<{position}>'
+            file_info.error_num +=1
             import_status = False
 
         # 电话号码（如有多个手机号请用“，”分隔)
         phone = str(sheet.cell(row, 3).value)
         if phone =='':
             file_info.remark = file_info.remark+f'\n行<{row+1}>电话号码不能为空<{phone}>'
+            file_info.error_num +=1
             import_status = False
         phone_list = [i for i in phone.split('，')]
         user_id_1=-1
@@ -579,9 +585,10 @@ def import_data(db,file_path,user_id,file_info):
             area_code=get_area_info_by_area_name(db,area_name)
             if area_code is None:
                 file_info.remark = file_info.remark+f'\n行<{row+1}>责任区域未找到'
+                file_info.error_num +=1
                 import_status = False
-            area_code = area_code.id
             area_code2 = area_code.area_code
+            area_code = area_code.id
         new_person = ThreeProofingResponsiblePerson(
             unit_id=unit_id,
             unit_name=unit_name,