From 785cd782757a14018fe093756f91bb0e99edc768 Mon Sep 17 00:00:00 2001
From: 13507605001 <Apan123456>
Date: Tue, 3 Jan 2023 15:43:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/temporary_auth/views.py | 20 ++++++++++++--------
 models/power_models.py       |  1 +
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/apps/temporary_auth/views.py b/apps/temporary_auth/views.py
index be1669d..90fd2ee 100644
--- a/apps/temporary_auth/views.py
+++ b/apps/temporary_auth/views.py
@@ -143,15 +143,19 @@ def solve_apply():
     if obj.is_solve == 1:
         return jsonify(Utils.false_return(msg="已受理,无需重复受理"))
     # obj.is_solve = 1
-    if not obj.solve_user_id:
-        obj.solve_user_id = user_id
+    if str(request.values.get('result')) == "0":
+        obj.information = request.values.get("information")
+        obj.is_solve = 2
     else:
-        if user_id == obj.solve_user_id:
-            return jsonify(Utils.false_return(msg="不能位同一人审批"))
-        obj.solve_user_id_pt=user_id
-        obj.is_solve = 1
-        obj.time_hour=t
-        BllUserTemporaryAuth().create_temporary_auth(user_ids=[obj.user_id, obj.user_id_pt], auth_type=2, t=t)
+        if not obj.solve_user_id:
+            obj.solve_user_id = user_id
+        else:
+            if user_id == obj.solve_user_id:
+                return jsonify(Utils.false_return(msg="不能位同一人审批"))
+            obj.solve_user_id_pt=user_id
+            obj.is_solve = 1
+            obj.time_hour=t
+            BllUserTemporaryAuth().create_temporary_auth(user_ids=[obj.user_id, obj.user_id_pt], auth_type=2, t=t)
     obj.solve_date = Utils.get_str_datetime()
     # obj.solve_user_id = user_id
     # obj.solve_user_id_pt = user_id_pt
diff --git a/models/power_models.py b/models/power_models.py
index 6ea8b5b..03d2054 100644
--- a/models/power_models.py
+++ b/models/power_models.py
@@ -94,6 +94,7 @@ class EntityUserApply(Base):
     func_type = Column(Integer, comment="类型")
     use_doc = Column(Text, comment="类型")
     time_hour = Column(String(50), comment="时间小时")
+    information = Column(Text, comment="驳回原因")
 
 
     # drug_name = Column(String(50), comment="试剂名称")