241230-1代码。

routers/api/ThreeProofingResponsible/person.py

@@ -26,6 +26,7 @@ from exceptions import AppException
 router = APIRouter()
 
 
+
 @router.post('/create')
 async def create_contact(
         db: Session = Depends(get_db),
@@ -137,6 +138,7 @@ async def update_contact(
 @router.get('/list')
 async def get_emergency_contact_list(
         type_parent_id: str = Query(None, description='单位名称'),
+        area_code:str = Query(None, description='单位名称'),
         Name: str = Query(None, description='联系人'),
         page: int = Query(1, gt=0, description='页码'),
         pageSize: int = Query(10, gt=0, description='每页条目数量'),
@@ -153,6 +155,8 @@ async def get_emergency_contact_list(
             query = query.filter(ThreeProofingResponsiblePerson.id.in_(person_list))
         if Name:
             query = query.filter(ThreeProofingResponsiblePerson.name.like(f'%{Name}%'))
+        if area_code:
+            query = query.filter(ThreeProofingResponsiblePerson.area_code==area_code)
 
         # 计算总条目数
         total_items = query.count()
@@ -171,16 +175,22 @@ async def get_emergency_contact_list(
             for type_parent in type_parent_id_list:
                 dict_data = get_dict_data_info(db,'three_proofing',type_parent)
                 type_parent_list.append({"type_parent_id":type_parent,"type_parent":dict_data.dict_label})
+            area_info = id_get_area_info(db,info.area_code)
+            user_info = user_id_get_user_info(db,info.create_by)
             contact_infos_list.append({
                 "id": info.id,
                 "unit_id": info.unit_id,
                 "unit_name": info.unit_name,
                 "name": info.name,
                 "area_code": info.area_code,
+                "area_name": area_info.area_name,
                 "position": info.position,
                 "phone": info.phone,
                 "order_num":info.order_num,
-                "create_time": info.create_time.strftime('%Y-%m-%d'),
+                "online_status":'0',
+                "create_time": info.create_time.strftime('%Y-%m-%d %H:%M:%S'),
+                "create_by":info.create_by,
+                "create_user":user_info.nick_name,
                 "type_parent_list":type_parent_list
             })
         # 返回结果+
@@ -211,6 +221,8 @@ async def get_emergency_contact_id_info(
                 'errmsg': '联系人不存在'
             })
         # 将查询结果转换为列表形式的字典
+        area_info = id_get_area_info(db,contact.area_code)
+        user_info = user_id_get_user_info(db,contact.create_by)
 
         contact_result = {
             "id": contact.id,
@@ -218,10 +230,14 @@ async def get_emergency_contact_id_info(
             "unit_name": contact.unit_name,
             "name": contact.name,
             "area_code":contact.area_code,
+            "area_name": area_info.area_name,
             "position": contact.position,
             "phone": contact.phone,
             "order_num":contact.order_num,
-            "create_time": contact.create_time.strftime('%Y-%m-%d'),
+            "online_status":'0',
+            "create_time": contact.create_time.strftime('%Y-%m-%d %H:%M:%S'),
+            "create_by":contact.create_by,
+            "create_user":user_info.nick_name,
             "type_list":[]
         }
 

utils/three_proofing_responsible_util.py

@@ -25,4 +25,8 @@ def get_person_list_by_type_parent_id(db,type_parent_id):
 def get_type_parent_id_by_person_id(db,person_id):
     query = db.query(ThreeProofingResponsiblePersonType)
     query = query.filter_by(person_id=person_id, del_flag='0')
-    return [info.type_parent_id for info in query.all()]
+    return [info.type_parent_id for info in query.all()]
+def id_get_area_info(db,id):
+    query = db.query(GovdataArea)
+    query = query.filter(GovdataArea.id == id)
+    return query.first()