Browse Source

241230-2代码。

baoyubo 4 months ago
parent
commit
6e1629d7d0

+ 33 - 1
routers/api/ThreeProofingResponsible/type_data.py

@@ -80,7 +80,7 @@ async def get_dict_data_by_type(
 ):
     try:
         # 根据 dict_type 查询字典数据
-        # dict_data = db.query(SysDictData).filter_by(dict_type=dictType).all()
+        # dict_data = dict_type_get_dict_data_info(db,'three_proofing')
         query = db.query(ThreeProofingResponsibleType)
 
         # 添加查询条件
@@ -256,3 +256,35 @@ async def delete_dict_data(
         # 处理异常
         traceback.print_exc()
         raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))
+
+@router.get('/treeData')
+async def get_dict_data_by_type(
+    db: Session = Depends(get_db),
+    body = Depends(remove_xss_json),
+    user_id = Depends(valid_access_token)
+):
+    try:
+        # 根据 dict_type 查询字典数据
+        # dict_data = db.query(SysDictData).filter_by(dict_type=dictType).all()
+
+        dict_data_list = []
+        dict_data = dict_type_get_dict_data_info(db, 'three_proofing')
+        for parent_info in dict_data:
+            data = {"id":parent_info.dict_value,"label":parent_info.dict_label,"css_class":parent_info.css_class}
+            type_list = get_type_parent_id_by_type_list(db,parent_info.dict_value)
+            if type_info:
+                children = []
+                for type_info in type_list:
+                    children.append({"id":type_info.id,"label":type_info.type_name,"parent_id":type_info.type_parent_id})
+                data['children']:children
+            dict_data_list.append(data)
+        result = {
+            "rows": dict_data_list,
+            "code": 200,
+            "msg": "查询成功"
+        }
+        return result
+
+    except Exception as e:
+        # 处理异常
+        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail=str(e))

+ 5 - 0
utils/ry_system_util.py

@@ -133,6 +133,11 @@ def get_dict_data_info(db,dict_type:str,dict_value:str):
     query = query.filter(SysDictData.dict_type == dict_type)
     query = query.filter(SysDictData.dict_value == dict_value)
     return query.first()
+def dict_type_get_dict_data_info(db,dict_type:str):
+    query = db.query(SysDictData)
+    query = query.filter(SysDictData.del_flag != '2')
+    query = query.filter(SysDictData.dict_type == dict_type)
+    return query.all()
 def dict_label_get_dict_data_info(db,dict_type:str,dict_label:str):
     query = db.query(SysDictData)
     query = query.filter(SysDictData.del_flag != '2')

+ 4 - 0
utils/three_proofing_responsible_util.py

@@ -14,6 +14,10 @@ def get_type_parent_id_by_type_id(db,type_id):
     query = db.query(ThreeProofingResponsibleType)
     query = query.filter_by(id = type_id,del_flag = '0')
     return query.first().type_parent_id
+def get_type_parent_id_by_type_list(db,person_id):
+    query = db.query(ThreeProofingResponsiblePersonType)
+    query = query.filter_by(person_id = person_id,del_flag = '0')
+    return query.all()
 def get_person_type_by_person_id(db,person_id):
     query = db.query(ThreeProofingResponsiblePersonType)
     query = query.filter_by(person_id = person_id,del_flag = '0')