250723-1代码。

routers/api/dutyManagement/schedule.py

@@ -26,10 +26,13 @@ import json
 router = APIRouter()
 
 
-def name_get_user_id(db,keywords):
+def name_get_user_id(db,keywords,islike=True):
     query = db.query(EmergencyContactUser)
     query = query.filter(EmergencyContactUser.del_flag != '2')
-    query = query.filter(EmergencyContactUser.name.like(f"%{keywords}%"))
+    if islike:
+        query = query.filter(EmergencyContactUser.name.like(f"%{keywords}%"))
+    else:
+        query = query.filter(EmergencyContactUser.name==keywords)
     data = query.all()
     return [info.id for info in data]
 
@@ -722,7 +725,9 @@ async def create_contact(
             #     msg =  f'\n行<{row + 1}>带班领导不能为空<{dbld}>'
             #     code = 500
             for name in  dbld.split(','):
-                personnel_id_list = name_get_user_id(db, name)
+                if name=='':
+                    continue
+                personnel_id_list = name_get_user_id(db, name,False)
                 if len(personnel_id_list)==0:
                     import_status  = False
                     msg = f'\n行<{row + 1}>非应急通讯录人员<{name}>'
@@ -734,7 +739,9 @@ async def create_contact(
             #     msg =  f'\n行<{row + 1}>科级带班不能为空<{kjdb}>'
             #     code = 500
             for name in  kjdb.split(','):
-                personnel_id_list = name_get_user_id(db, name)
+                if name=='':
+                    continue
+                personnel_id_list = name_get_user_id(db, name,False)
                 if len(personnel_id_list)==0:
                     import_status  = False
                     msg = f'\n行<{row + 1}>非应急通讯录人员<{name}>'
@@ -746,7 +753,9 @@ async def create_contact(
             #     msg =  f'\n行<{row + 1}>主班不能为空<{zb}>'
             #     code = 500
             for name in  zb.split(','):
-                personnel_id_list = name_get_user_id(db, name)
+                if name=='':
+                    continue
+                personnel_id_list = name_get_user_id(db, name,False)
                 if len(personnel_id_list)==0:
                     import_status  = False
                     msg = f'\n行<{row + 1}>非应急通讯录人员<{name}>'
@@ -758,7 +767,9 @@ async def create_contact(
             #     msg =  f'\n行<{row + 1}>专职不能为空<{zz}>'
             #     code = 500
             for name in  zz.split(','):
-                personnel_id_list = name_get_user_id(db, name)
+                if name=='':
+                    continue
+                personnel_id_list = name_get_user_id(db, name,False)
                 if len(personnel_id_list)==0:
                     import_status  = False
                     msg = f'\n行<{row + 1}>非应急通讯录人员<{name}>'
@@ -784,9 +795,11 @@ async def create_contact(
                 duty_type=duty_type,
                 create_by=user_id
             )
+            # print(start_date+str(shift_type))
             duty_data[start_date+str(shift_type)] = new_duty_data
             # 添加到会话并提交
-            duty_persion_data[start_date+ str(shift_type)] = user_data
+            duty_persion_data[start_date+str(shift_type)] = user_data
+            # print(duty_persion_data)
             # db.add(new_duty_data)
             # db.commit()
             # db.refresh(new_duty_data)
@@ -807,7 +820,9 @@ async def create_contact(
                 db.commit()
                 db.refresh(new_duty_data)
                 user_list = []
+
                 for user_info in duty_persion_data[duty]:
+                    # print(new_duty_data.id,user_info)
                     user_list.append(DutyPersonnelArrangement(
                         duty_id=new_duty_data.id,
                         position_id=user_info['position_id'],