fix20221121

apps/inves_manage/view.py

@@ -833,7 +833,7 @@ def distribute_project():
         user_name = user_obj.real_name
     except Exception as e:
         current_app.logger.error(e)
-        return jsonify(code=RET.DBERR, msg="用户信息校验失败，请重新登陆后尝试！")
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
 
     district_list1 = []  # 成功被分发到的区县
     try:
@@ -931,7 +931,7 @@ def get_project_detail():
         user_obj = verify_token(token)
     except Exception as e:
         current_app.logger.error(e)
-        return jsonify(code=RET.DBERR, msg="用户信息校验失败，请重新登陆后尝试！")
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
 
     req_dic = request.get_json()
     project_id = req_dic['project_id']
@@ -979,7 +979,7 @@ def edit_project_detail():
         user_name = user_obj.real_name
     except Exception as e:
         current_app.logger.error(e)
-        return jsonify(code=RET.DBERR, msg="用户信息校验失败，请重新登陆后尝试！")
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
     req_dic = request.get_json()
     project_id = req_dic['project_id']
     try:
@@ -1023,7 +1023,7 @@ def project_transition():
         user_name = user_obj.real_name
     except Exception as e:
         current_app.logger.error(e)
-        return jsonify(code=RET.DBERR, msg="用户信息校验失败，请重新登陆后尝试！")
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
     req_dic = request.get_json()
     project_id = req_dic['project_id']
     flag = req_dic['flag']  # 当前位置：2为对接库，3为签约库
@@ -1062,7 +1062,7 @@ def project_move():
         user_name = user_obj.real_name
     except Exception as e:
         current_app.logger.error(e)
-        return jsonify(code=RET.DBERR, msg="用户信息校验失败，请重新登陆后尝试！")
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
 
     try:
         req_dic = request.get_json()
@@ -1095,7 +1095,7 @@ def add_progress():
         user_name = user_obj.real_name
     except Exception as e:
         current_app.logger.error(e)
-        return jsonify(code=RET.DBERR, msg="用户信息校验失败，请重新登陆后尝试！")
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
 
     add_time = datetime.now()
     try:
@@ -1131,7 +1131,7 @@ def edit_progress():
         user_name = user_obj.real_name
     except Exception as e:
         current_app.logger.error(e)
-        return jsonify(code=RET.DBERR, msg="用户信息校验失败，请重新登陆后尝试！")
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
 
     try:
         req_dic = request.get_json()
@@ -1160,10 +1160,16 @@ def edit_progress():
 def check_project_detail():
     req_dic = request.get_json()
     project_id = req_dic['project_id']
-    # flag = req_dic['flag']   # 2为对接库，3为签约库，4为开工库
-
     token = request.headers['token']
     try:
+        user_obj = verify_token(token)
+        user_name = user_obj.real_name
+    except Exception as e:
+        current_app.logger.error(e)
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
+
+
+    try:
         project_obj = SikuProject.query.get(project_id)
         flag = project_obj.flag
         if flag == 2:
@@ -1321,7 +1327,7 @@ def edit_project():
         user_id = user_obj.id
     except Exception as e:
         current_app.logger.error(e)
-        return jsonify(code=RET.DBERR, msg="用户信息校验失败，请重新登陆后尝试！")
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
     # 三库共有的
     project_id = request.form['project_id']
     # flag = request.form['flag']  # 2为对接库，3为签约库，4为开工库
@@ -1516,7 +1522,7 @@ def batch_export_project1():
         user_name = user_obj.real_name
     except Exception as e:
         current_app.logger.error(e)
-        return jsonify(code=RET.DBERR, msg="用户信息校验失败，请重新登陆后尝试！")
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
     select_id_list = req_dic["select_id_list"]
     path = './apps/static/project_file/'
     # pro_path = 'D:/中研项目代码/flask_jincheng/apps/statics/project_file/'
@@ -1611,7 +1617,7 @@ def batch_export_project2():
         user_name = user_obj.real_name
     except Exception as e:
         current_app.logger.error(e)
-        return jsonify(code=RET.DBERR, msg="用户信息校验失败，请重新登陆后尝试！")
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
     select_id_list = req_dic["select_id_list"]
     path = './apps/static/project_file/'
     # pro_path = 'D:/中研项目代码/flask_jincheng/apps/statics/project_file/'
@@ -1721,7 +1727,7 @@ def batch_export_project3():
         user_name = user_obj.real_name
     except Exception as e:
         current_app.logger.error(e)
-        return jsonify(code=RET.DBERR, msg="用户信息校验失败，请重新登陆后尝试！")
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
     select_id_list = req_dic["select_id_list"]
     path = './apps/static/project_file/'
     # pro_path = 'D:/中研项目代码/flask_jincheng/apps/statics/project_file/'
@@ -1845,7 +1851,7 @@ def batch_export_project4():
         user_name = user_obj.real_name
     except Exception as e:
         current_app.logger.error(e)
-        return jsonify(code=RET.DBERR, msg="用户信息校验失败，请重新登陆后尝试！")
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
     select_id_list = req_dic["select_id_list"]
     path = './apps/static/project_file/'
     # pro_path = 'D:/中研项目代码/flask_jincheng/apps/statics/project_file/'
@@ -1965,13 +1971,13 @@ def get_project_log():
     try:
         log_obj_list = ProjectDynamicLog.query.filter(ProjectDynamicLog.project_id == project_id)
         log_obj_list = log_obj_list.order_by(ProjectDynamicLog.time.desc()).paginate(page, per_page).items
-
+        size = len(log_obj_list)
         data = [{
             "id": log_obj.id,
             "item": log_obj.operation_people + log_obj.item,
             "time": log_obj.time,
         } for log_obj in log_obj_list]
-        return jsonify(code=RET.OK, data=data, msg='项目动态信息获取成功！')
+        return jsonify(code=RET.OK, data={'data': data, 'size': size, 'msg': '项目动态信息获取成功！'})
 
     except Exception as e:
         current_app.logger.error(e)