fix20221121

apps/inves_manage/__init__.py

@@ -3,5 +3,6 @@ from flask import Blueprint
 api_manage = Blueprint("api_manage", __name__)
 
 from . import view
+from . import project_manager
 
 "招商资源管理"

apps/inves_manage/view.py

@@ -355,6 +355,13 @@ def upload_daily_picture(file_type, file_name, file):
         return jsonify(code=RET.THIRDERR, msg='第三方系统(阿里云oss存储)出错！')
 
 
+@api_manage.route("/UploadPic", methods=["POST"])
+def upload_pic():
+    file = request.files['file']
+    file_name = request.form['file_name']
+    upload_daily_picture(2, file_name, file)
+
+
 # 编辑页文件图片删除接口
 def file_delete(file_del_list, img_del_list, project_id, flag):
     if file_del_list:
@@ -1268,7 +1275,7 @@ def check_project_detail():
         if progress_obj_list:
             progress_data = [{
                 "id": progress_obj.id,
-                "time": progress_obj.add_time,
+                "time": progress_obj.add_time.strftime("%Y-%m-%d %H:%M:%S"),
                 "info": progress_obj.info
             # } for progress_obj in progress_obj_list if progress_obj.flag == flag]
             } for progress_obj in progress_obj_list]
@@ -1291,6 +1298,7 @@ def check_project_detail():
             # 第三方联系人
             three_list = project_obj.sign_threes
             three_data = [{
+                "id": three_obj.id,
                 "name": three_obj.name,
                 "people": three_obj.people,
                 "mobile": three_obj.mobile,
@@ -1317,6 +1325,89 @@ def check_project_detail():
         return jsonify(code=RET.DBERR, msg="操作失败！数据库查询错误")
 
 
+# 新增第三方
+@api_manage.route("/AddThree", methods=["POST"])
+def add_three():
+    token = request.headers['token']
+    try:
+        user_obj = verify_token(token)
+        user_name = user_obj.real_name
+        user_id = user_obj.id
+    except Exception as e:
+        current_app.logger.error(e)
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
+    req_dic = request.get_json()
+    name = req_dic['name']
+    people = req_dic['people']
+    mobile = req_dic['mobile']
+    project_id = req_dic['project_id']
+    try:
+        three_obj = SignThree(
+            name=name,
+            people=people,
+            mobile=mobile,
+            project_id=project_id
+        )
+        db.session.add(three_obj)
+        db.session.commit()
+        return jsonify(code=RET.OK, msg="第三方保存成功")
+
+    except Exception as e:
+        current_app.logger.error(e)
+        return jsonify(code=RET.DBERR, msg="第三方保存出错，编辑失败！")
+
+
+# 编辑第三方
+@api_manage.route("/EditThree", methods=["POST"])
+def edit_three():
+    token = request.headers['token']
+    try:
+        user_obj = verify_token(token)
+    except Exception as e:
+        current_app.logger.error(e)
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
+    req_dic = request.get_json()
+
+    req_dic = request.get_json()
+    three_id = req_dic['three_id']
+    name = req_dic['name']
+    people = req_dic['people']
+    mobile = req_dic['mobile']
+    try:
+        three_obj = SignThree.query.get(three_id)
+        three_obj.name = name
+        three_obj.people = people
+        three_obj.mobile = mobile
+        db.session.commit()
+        return jsonify(code=RET.OK, msg="第三方编辑成功")
+    except Exception as e:
+        current_app.logger.error(e)
+        return jsonify(code=RET.DBERR, msg="第三方编辑出错，编辑失败！")
+
+
+# 删除第三方
+@api_manage.route("/DeleteThree", methods=["POST"])
+def delete_three():
+    token = request.headers['token']
+    try:
+        user_obj = verify_token(token)
+        user_name = user_obj.real_name
+        user_id = user_obj.id
+    except Exception as e:
+        current_app.logger.error(e)
+        return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败，请重新登陆后尝试！")
+    req_dic = request.get_json()
+    three_id = req_dic['three_id']
+    try:
+        three_obj = SignThree.query.get(three_id)
+        db.session.delete(three_obj)
+        db.session.commit()
+        return jsonify(code=RET.OK, msg="第三方删除成功")
+    except Exception as e:
+        current_app.logger.error(e)
+        return jsonify(code=RET.DBERR, msg="第三方删除出错！")
+
+
 # 编辑对接库、签约库、开工库
 @api_manage.route("/EditProject", methods=["POST"])
 def edit_project():
@@ -1331,7 +1422,6 @@ def edit_project():
     # 三库共有的
     project_id = request.form['project_id']
     # flag = request.form['flag']  # 2为对接库，3为签约库，4为开工库
-    three_list = request.files.getlist('three_list')
 
     img_list = request.files.getlist('img_list')
     file_list = request.files.getlist('file_list')
@@ -1426,21 +1516,6 @@ def edit_project():
         if sign_explain and flag == 4:
             project_obj.sign_explain = sign_explain
 
-        try:
-            if three_list:
-                for three_obj in three_list:
-                    three_obj = SignThree(
-                        name=three_obj.name,
-                        people=three_obj.people,
-                        mobile=three_obj.mobile,
-                        project_id=project_id
-                    )
-                    db.session.add(three_obj)
-                    db.session.commit()
-        except Exception as e:
-            current_app.logger.error(e)
-            return jsonify(code=RET.DBERR, msg="第三方保存出错，编辑失败！")
-
         # 删除文件和图片
         if file_del_list or img_del_list:
             result = file_delete(file_del_list, img_del_list, project_id, flag)
@@ -1970,8 +2045,8 @@ def get_project_log():
     per_page = req_dic['per_page']
     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)
+        log_obj_list = log_obj_list.order_by(ProjectDynamicLog.time.desc()).paginate(page, per_page).items
         data = [{
             "id": log_obj.id,
             "item": log_obj.operation_people + log_obj.item,