From 15c3c3159ac76b32cc5100ffe53a74e0c533c882 Mon Sep 17 00:00:00 2001
From: zty <1048209592@qq.com>
Date: Mon, 15 Jul 2024 16:22:03 +0800
Subject: [PATCH] =?UTF-8?q?1.api=E5=A2=9E=E5=8A=A0=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=202.=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E9=9B=86=E5=A4=B1=E8=B4=A5=E5=A2=9E=E5=8A=A0=E7=A9=BA=E5=8F=82?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=203.=E5=AD=A3=E5=BA=A6=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E8=A1=A8ext=E5=AD=97=E6=AE=B5=E7=94=B1json=E6=94=B9=E4=B8=BAjs?=
 =?UTF-8?q?onObject=204.=E5=A2=9E=E5=8A=A0=E5=AD=A3=E5=BA=A6=E8=80=83?=
 =?UTF-8?q?=E6=A0=B8=E6=8C=87=E6=A0=87=E7=BC=96=E8=BE=91=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=88=E8=87=AA=E8=AF=84/=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E8=AF=84=E5=88=86=EF=BC=89=E5=8F=8A=E5=AE=A1=E6=A0=B8=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=205.=E5=AD=A3=E5=BA=A6=E8=80=83=E6=A0=B8=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E6=8E=A7=E5=88=B6=E5=B1=82=206.=E5=AD=A3=E5=BA=A6?=
 =?UTF-8?q?=E8=80=83=E6=A0=B8=E6=8C=87=E6=A0=87=E5=A2=9E=E5=8A=A0ext?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84=EF=BC=8CgetList=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=A2=9E=E5=8A=A0id=E5=88=A4=E6=96=AD=207.=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E5=AD=A3=E5=BA=A6=E8=80=83=E6=A0=B8=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9=E9=9B=86?=
 =?UTF-8?q?=E5=90=88=EF=BC=8Cif=E6=9D=A1=E4=BB=B6=E6=9B=B4=E6=94=B9=208.?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9-=E5=AD=A3=E5=BA=A6?=
 =?UTF-8?q?=E8=80=83=E6=A0=B8=E6=8C=87=E6=A0=87=E5=A2=9E=E5=8A=A0(?=
 =?UTF-8?q?=E4=BC=AA)=E5=B7=A5=E4=BD=9C=E6=B5=81=209.=E5=AD=A3=E5=BA=A6?=
 =?UTF-8?q?=E8=80=83=E6=A0=B8=E6=8C=87=E6=A0=87=E6=9F=A5=E8=AF=A2=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=E6=9C=89=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=89=A9=E6=9F=A5=E8=AF=A2=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=EF=BC=88=E4=BC=AA=EF=BC=89=E5=B7=A5=E4=BD=9C=E6=B5=81=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E5=BD=93=E5=89=8D=E6=89=A7=E8=A1=8C=E4=BA=BA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xqopen/kehui/Api.java       |   4 +-
 .../kehui/flows/util/ProjectInitListener.java |  28 ++-
 .../xml/ProjectAssessmentIndicatorsMapper.xml |   5 +-
 .../kehui/mapper/xml/ProjectInfoDao.xml       |   2 +-
 ...ProjectAssessmentIndicatorsController.java | 160 +++++++++++++++++-
 .../project/action/ProjectInitComtroller.java |  21 ++-
 .../ProjectQuarterlyEvaluationController.java |  53 +++---
 .../api/ProjectAssessmentIndicatorsApi.java   |   9 +
 .../entity/ProjectAssessmentIndicators.java   |   4 +-
 .../entity/ProjectQuarterlyEvaluation.java    |   5 +-
 .../com/xqopen/kehui/util/ApiResponse.java    |   7 +-
 11 files changed, 262 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/xqopen/kehui/Api.java b/src/main/java/com/xqopen/kehui/Api.java
index 78ffea5..de04475 100644
--- a/src/main/java/com/xqopen/kehui/Api.java
+++ b/src/main/java/com/xqopen/kehui/Api.java
@@ -382,8 +382,8 @@ public class Api {
      */
     public static final String PROJECT_QUARTERLY_EVALUATION=PROJECT_PREFIX+"/quarterExamine";
     public static final String PROJECT_QUARTERLY_EVALUATION_LIST=PROJECT_QUARTERLY_EVALUATION+"/list";
-
-
+    public static final String PROJECT_QUARTERLY_EVALUATION_UPDATE=PROJECT_QUARTERLY_EVALUATION+"/update";
+    public static final String PROJECT_QUARTERLY_EVALUATION_EXAMINE=PROJECT_QUARTERLY_EVALUATION+"/examine";
 
 
     public static final String PROJECT_INFO_GET_ACCEPT_PROJECTS = PROJECT_INFO + "/accept";
diff --git a/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java b/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
index cab22cf..bb7c653 100644
--- a/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
+++ b/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java
@@ -3,6 +3,7 @@ package com.xqopen.kehui.flows.util;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.xqopen.kehui.common.entity.SystemUserLogin;
 import com.xqopen.kehui.common.service.ISystemUserLoginService;
 import com.xqopen.kehui.exception.ErrorCode;
 import com.xqopen.kehui.exception.XQException;
@@ -10,6 +11,7 @@ import com.xqopen.kehui.flows.service.IFlowsService;
 import com.xqopen.kehui.project.entity.ProjectInfo;
 import com.xqopen.kehui.project.entity.ProjectQuarterlyEvaluation;
 import com.xqopen.kehui.project.entity.ProjectWeekly;
+import com.xqopen.kehui.project.service.IProjectAssessmentIndicatorsService;
 import com.xqopen.kehui.project.service.IProjectInfoService;
 import com.xqopen.kehui.project.service.IProjectWeeklyService;
 import com.xqopen.kehui.project.service.ProjectQuarterlyEvaluationService;
@@ -21,6 +23,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -38,6 +41,8 @@ public class ProjectInitListener implements ExecutionListener {
     ISystemUserLoginService systemUserLoginService;
     @Autowired
     ProjectQuarterlyEvaluationService projectQuarterlyEvaluationService;
+    @Autowired
+    IProjectAssessmentIndicatorsService projectAssessmentIndicatorsService;
 
     @Override
     @Transactional
@@ -98,12 +103,24 @@ public class ProjectInitListener implements ExecutionListener {
                             ProjectQuarterlyEvaluation quarterlyEvaluation = new ProjectQuarterlyEvaluation();
                             quarterlyEvaluation.setCreatedBy(projectManager);
                             JSONArray projectAdmin = (JSONArray) ext.get("projectAdmin");
+                            JSONArray branchLeaders = (JSONArray) ext.get("branchLeaders");
+                            JSONArray MainLeader = (JSONArray) ext.get("MainLeader");
+                            //添加json数据
                             JSONObject jsonObject = new JSONObject();
-                            jsonObject.put("projectAdmin",projectAdmin.get(1));
+                            jsonObject.put("projectManager",getSystemUserLogin(projectManager).getId());
+                            jsonObject.put("projectAdmin",getSystemUserLogin(String.valueOf(projectAdmin.get(1))).getId());
+                            jsonObject.put("branchLeaders",getSystemUserLogin(String.valueOf(branchLeaders.get(1))).getId());
+                            jsonObject.put("MainLeader",getSystemUserLogin(String.valueOf(MainLeader.get(1))).getId());
+                            jsonObject.put("executor",getSystemUserLogin(projectManager).getId());
                             quarterlyEvaluation.setExt(jsonObject);
                             quarterlyEvaluation.setCreatedAt(new Timestamp(System.currentTimeMillis()));
                             quarterlyEvaluation.setProjectId(String.valueOf(projectInfo.getId()));
                             projectQuarterlyEvaluationService.insert(quarterlyEvaluation);
+                            //添加季度审核的状态
+                            JSONObject infoExt = projectInfo.getExt();
+                            infoExt.put("taskName","季度审核填报");//任务节点
+                            infoExt.put("executor",getSystemUserLogin(projectManager).getId());//当前委托人
+                            if(!StringUtils.isEmpty(projectInfo.getId()))projectInfoService.updateById(projectInfo);
                         }
                     }
                 }
@@ -114,4 +131,13 @@ public class ProjectInitListener implements ExecutionListener {
             throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
         }
     }
+    private SystemUserLogin getSystemUserLogin(String name) {
+        SystemUserLogin systemUserLogin = new SystemUserLogin();
+        if(!StringUtils.isEmpty(name)){
+            EntityWrapper<SystemUserLogin> wrapper = new EntityWrapper<>();
+            wrapper.eq(SystemUserLogin.USERINFO_ID,Long.parseLong(name));
+            systemUserLogin = systemUserLoginService.selectOne(wrapper);
+        }
+        return systemUserLogin;
+    }
 }
diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectAssessmentIndicatorsMapper.xml b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectAssessmentIndicatorsMapper.xml
index 7cfdef7..51fddee 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectAssessmentIndicatorsMapper.xml
+++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectAssessmentIndicatorsMapper.xml
@@ -21,6 +21,7 @@
             <result property="projectId" column="project_id" jdbcType="BIGINT"/>
             <result property="quarter" column="quarter" jdbcType="VARCHAR"/>
             <result property="number" column="number" jdbcType="BIGINT"/>
+            <result property="ext" column="ext_" jdbcType="JAVA_OBJECT"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -36,6 +37,8 @@
         <if test="indicators.projectId!=null">
             and project_id =#{indicators.projectId}
         </if>
-
+        <if test="indicators.id!=null">
+            and id_=#{indicators.id}
+        </if>
     </select>
 </mapper>
diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml
index 6f3dc7b..6527de9 100644
--- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml
+++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml
@@ -147,7 +147,7 @@
 	</select>
     <select id="getListByIds"  resultMap="ProjectInfoList">
         select * from project_info where 1=1
-        <if test="list!=null">
+        <if test="list.size>0">
             and cast(id_ as varchar) in
             <foreach collection="list" item="id" open="(" separator="," close=")">
                 #{id}
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java
index 7b4be96..4222cc2 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java
@@ -1,21 +1,35 @@
 package com.xqopen.kehui.project.action;
 
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.support.spring.FastJsonJsonView;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.xqopen.kehui.Api;
+import com.xqopen.kehui.common.entity.SystemUserLogin;
+import com.xqopen.kehui.common.service.ISystemUserLoginService;
 import com.xqopen.kehui.exception.ErrorCode;
 import com.xqopen.kehui.exception.XQException;
 import com.xqopen.kehui.project.api.ProjectAssessmentIndicatorsApi;
 import com.xqopen.kehui.project.entity.ProjectAssessmentIndicators;
+import com.xqopen.kehui.project.entity.ProjectInfo;
+import com.xqopen.kehui.project.entity.ProjectQuarterlyEvaluation;
 import com.xqopen.kehui.project.service.IProjectAssessmentIndicatorsService;
+import com.xqopen.kehui.project.service.IProjectInfoService;
+import com.xqopen.kehui.project.service.ProjectQuarterlyEvaluationService;
 import com.xqopen.kehui.util.ApiResponse;
 import com.xqopen.kehui.util.PageNoUtil;
 import com.xqopen.kehui.util.ResultListReqUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.sql.Timestamp;
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @RestController
@@ -23,18 +37,158 @@ import java.util.List;
 public class ProjectAssessmentIndicatorsController implements ProjectAssessmentIndicatorsApi {
     @Autowired
     IProjectAssessmentIndicatorsService indicatorsService;
+    @Autowired
+    IProjectInfoService projectInfoService;
+    @Autowired
+    ProjectQuarterlyEvaluationService evaluationService;
+    @Autowired
+    ISystemUserLoginService userLoginService;
 
     @Override
     @PostMapping(Api.PROJECT_QUARTERLY_EVALUATION_LIST)
     public String list(@RequestHeader Long userId, @RequestBody PageNoUtil<ProjectAssessmentIndicators> pageNoUtil) throws XQException {
         try {
-            Page<ProjectAssessmentIndicators> page = new Page<>(pageNoUtil.getPageNo(),pageNoUtil.getPageSize());
+            Page<ProjectAssessmentIndicators> page = new Page<>(pageNoUtil.getPageNo(), pageNoUtil.getPageSize());
             List<ProjectAssessmentIndicators> indicatorsServiceList = indicatorsService.getList(page, pageNoUtil.getT());
-            ResultListReqUtil<ProjectAssessmentIndicators> listReqUtil = new ResultListReqUtil<>(indicatorsServiceList,pageNoUtil.getPageNo(),pageNoUtil.getPageSize());
+            ResultListReqUtil<ProjectAssessmentIndicators> listReqUtil = new ResultListReqUtil<>(indicatorsServiceList, pageNoUtil.getPageNo(), pageNoUtil.getPageSize());
             return ApiResponse.fillSuccess(listReqUtil);
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("ProjectAssessmentIndicatorsController.list", e);
             throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
         }
     }
+
+    @Override
+    @PostMapping(Api.PROJECT_QUARTERLY_EVALUATION_UPDATE)
+    public String update(@RequestHeader Long userId, @RequestBody PageNoUtil<ProjectAssessmentIndicators> pageNoUtil) throws XQException {
+        try {
+            if (!ObjectUtils.isEmpty(pageNoUtil)) {
+                ProjectAssessmentIndicators indicators = pageNoUtil.getT();
+                if (!ObjectUtils.isEmpty(indicators)) {
+                    Long id = indicators.getId();
+                    if (id == null) return ApiResponse.fillFail("操作异常!");
+                    JSONObject ext = indicators.getExt();
+                    if (!ObjectUtils.isEmpty(ext)) {
+                        //如果ext里面有所项目管理员打分字段，先判断当前账号是否是管理员
+                        String adminScoring = String.valueOf(ext.get("adminScoring"));
+                        if (!StringUtils.isEmpty(adminScoring) && !"null".equals(adminScoring)) {
+                            String projectAdmin = String.valueOf(ext.get("projectAdmin"));
+                            if (userId != null && !StringUtils.isEmpty(projectAdmin)) {
+                                if (!userId.equals(projectAdmin)) {//如果当前账号不是管理员直接返回
+                                    return ApiResponse.fillFail("你不是所项目管理员无法打分!");
+                                }
+                            }
+                        }
+                    }
+                    if (indicatorsService.updateById(indicators)) return ApiResponse.fillSuccess("操作成功！");
+                }
+            }
+        } catch (Exception e) {
+            log.error("ProjectAssessmentIndicatorsController.update", e);
+            throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
+        }
+        return ApiResponse.fillFail("操作失败！");
+    }
+
+    @Override
+    @Transactional
+    @PostMapping(Api.PROJECT_QUARTERLY_EVALUATION_EXAMINE)
+    public String examine(@RequestHeader Long userId, @RequestBody Map map) throws XQException {
+        try {
+            if (!ObjectUtils.isEmpty(map)) {
+                String id = String.valueOf(map.get("id"));//项目id
+                ProjectInfo projectInfo = projectInfoService.selectById(Long.parseLong(id));
+                if (!ObjectUtils.isEmpty(projectInfo)) {
+                    JSONObject ext = projectInfo.getExt();
+                    if (!ObjectUtils.isEmpty(ext)) {
+                        String taskName = String.valueOf(ext.get("taskName"));//节点名称
+                        String examine = String.valueOf(map.get("examine"));//通过or驳回
+                        switch (taskName) {
+                            case "季度审核填报":
+                                if ("1".equals(examine)) {
+                                    return ApiResponse.fillFail("季度审核填报无法驳回！");
+                                }
+                                examine(userId, "管理员审核", ext, "projectAdmin", projectInfo);
+                                break;
+                            case "管理员审核":
+                                ext.put("adminSpyj", map.get("spyj"));
+                                if ("0".equals(examine)) {
+                                    examine(userId, "分管领导审核", ext, "branchLeaders", projectInfo);
+                                } else if ("1".equals(examine)) {
+                                    examine(userId, "季度审核填报", ext, "projectManager", projectInfo);
+                                }
+                                break;
+                            case "分管领导审核":
+                                ext.put("branchLeadersSpyj", map.get("spyj"));
+                                if ("0".equals(examine)) {
+                                    examine(userId, "主要领导审核", ext, "MainLeader", projectInfo);
+                                } else if ("1".equals(examine)) {
+                                    examine(userId, "管理员审核", ext, "projectAdmin", projectInfo);
+                                }
+                                break;
+                            case "主要领导审核":
+                                if ("0".equals(examine)) {
+                                    ext.put("MainLeaderSpyj", map.get("spyj"));
+                                    examine(userId, "主要领导审核", ext, "MainLeader", projectInfo);
+                                } else if ("1".equals(examine)) {
+                                    examine(userId, "分管领导审核", ext, "branchLeaders", projectInfo);
+                                }
+                            default:
+                                break;
+                        }
+                        return ApiResponse.fillSuccess("操作成功！");
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error("ProjectAssessmentIndicatorsController.examine", e);
+            //            批量新增出现异常被捕获时，手动回滚事务，保证数据库一致
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
+        }
+        return ApiResponse.fillFail();
+    }
+
+    /**
+     * 审核
+     *
+     * @param taskName
+     * @param ext
+     * @param role
+     * @param projectInfo
+     */
+    public void examine(Long userId, String taskName, JSONObject ext, String role, ProjectInfo projectInfo) {
+        EntityWrapper<ProjectQuarterlyEvaluation> evaluationEntityWrapper = new EntityWrapper<>();
+        evaluationEntityWrapper.eq("project_id", String.valueOf(projectInfo.getId()));
+        evaluationEntityWrapper.eq("is_deleted", "0");
+        ProjectQuarterlyEvaluation quarterlyEvaluation = evaluationService.selectOne(evaluationEntityWrapper);
+        if (!ObjectUtils.isEmpty(quarterlyEvaluation)) {
+            JSONObject quarterlyEvaluationExt = quarterlyEvaluation.getExt();
+            String user = String.valueOf(quarterlyEvaluationExt.get(role));
+            quarterlyEvaluationExt.put("taskName", taskName);
+            if ("流程结束".equals(taskName)) {
+                user = "";
+            }
+            quarterlyEvaluationExt.put("executor", user);
+            quarterlyEvaluation.setExt(quarterlyEvaluationExt);
+            quarterlyEvaluation.setUpdatedAt(new Timestamp(System.currentTimeMillis()));
+            quarterlyEvaluation.setUpdatedBy(String.valueOf(userId));
+            evaluationService.updateById(quarterlyEvaluation);
+
+            ext.put("taskName", taskName);
+            ext.put("executor", user);
+            projectInfo.setExt(ext);
+            projectInfoService.updateById(projectInfo);
+        }
+    }
+
+    private SystemUserLogin getSystemUserLogin(String name) {
+        SystemUserLogin systemUserLogin = new SystemUserLogin();
+        if (!StringUtils.isEmpty(name)) {
+            EntityWrapper<SystemUserLogin> wrapper = new EntityWrapper<>();
+            wrapper.eq(SystemUserLogin.USERINFO_ID, Long.parseLong(name));
+            systemUserLogin = userLoginService.selectOne(wrapper);
+        }
+        return systemUserLogin;
+    }
 }
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java b/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
index e605b99..a0cd2c4 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java
@@ -35,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.sql.Timestamp;
@@ -129,11 +130,21 @@ public class ProjectInitComtroller implements ProjectInitApi {
             infoService.insert(info);
             //批量新增项目考核季度表
             if (!ObjectUtils.isEmpty(initDto)) {
+                JSONObject ext = info.getExt();
+                String projectAdmin= String.valueOf(((ArrayList) ext.get("projectAdmin")).get(1));
+                String branchLeaders= String.valueOf(((ArrayList) ext.get("branchLeaders")).get(1));
+                String MainLeader= String.valueOf(((ArrayList) ext.get("MainLeader")).get(1));
+
                 List<ProjectAssessmentIndicators> membersList = initDto.getMembersList();
                 if (!membersList.isEmpty()) {
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("projectAdmin",getSystemUserLogin(projectAdmin).getId());
+                    jsonObject.put("branchLeaders",getSystemUserLogin(branchLeaders).getId());
+                    jsonObject.put("MainLeader",getSystemUserLogin(MainLeader).getId());
                     membersList.forEach(item -> {
                         item.setProjectId(info.getId());
                         item.setCreatedBy(userId);
+                        item.setExt(jsonObject);
                         item.setCreatedAt(new Timestamp(System.currentTimeMillis()));
                         item.setUpdatedBy(null);
                     });
@@ -198,7 +209,15 @@ public class ProjectInitComtroller implements ProjectInitApi {
         }
         return systemUserLogin;
     }
-
+    private SystemUserLogin getSystemUserLogin(String name) {
+        SystemUserLogin systemUserLogin = new SystemUserLogin();
+        if(!StringUtils.isEmpty(name)){
+            EntityWrapper<SystemUserLogin> wrapper = new EntityWrapper<>();
+            wrapper.eq(SystemUserLogin.USERINFO_ID,Long.parseLong(name));
+            systemUserLogin = userLoginService.selectOne(wrapper);
+        }
+        return systemUserLogin;
+    }
     private activitiEnum.activitiType getActivitiType(String projectCategory, activitiEnum.activitiClass aClass) {
         activitiEnum.activitiType aType = null;
         switch (aClass) {
diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java
index 54b8bf0..27bf788 100644
--- a/src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java
+++ b/src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java
@@ -19,8 +19,10 @@ import com.xqopen.kehui.util.PageNoUtil;
 import com.xqopen.kehui.util.ResultListReqUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -37,28 +39,33 @@ public class ProjectQuarterlyEvaluationController implements ProjectQuarterlyEva
     @Override
     @PostMapping(Api.PROJECT_QUARTERLY_EVALUATION)
     public String list(@RequestHeader Long userId, @RequestBody PageNoUtil<ProjectQuarterlyEvaluation> pageNoUtil) throws XQException {
-       try {
-           //先拿到季度审核表数据
-           EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
-           userLoginEntityWrapper.eq("id_",userId);
-           SystemUserLogin systemUserLogin = userLoginService.selectOne(userLoginEntityWrapper);
-           EntityWrapper<ProjectQuarterlyEvaluation> evaluationEntityWrapper = new EntityWrapper<>();
-           evaluationEntityWrapper.eq("is_deleted","0");
-           evaluationEntityWrapper.eq("created_by",String.valueOf(systemUserLogin.getUserinfoId()));
-           evaluationEntityWrapper.setSqlSelect("project_id");
-           List<Object> evaluationList = quarterlyEvaluationService.selectObjs(evaluationEntityWrapper);
-           Page<ProjectInfo> page = new Page<>(pageNoUtil.getPageNo(),pageNoUtil.getPageSize());
-
-           //通过季度审核表的项目id集合，查询到当前负责人下面的项目列表
-           List<ProjectInfoListItemResp> list = projectInfoService.getListByIds(page, evaluationList);
-           ResultListReqUtil<ProjectInfoListItemResp> listReqUtil = new ResultListReqUtil<>();
-           listReqUtil.setLs(list);
-           listReqUtil.setPages(page.getPages());
-           listReqUtil.setTotal(page.getTotal());
-           return ApiResponse.fillSuccess(listReqUtil);
-       }catch (Exception e){
-           log.error("ProjectQuarterlyEvaluationController.list", e);
-           throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
-       }
+        try {
+            //先拿到季度审核表数据
+            EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
+            userLoginEntityWrapper.eq("id_", userId);
+            SystemUserLogin systemUserLogin = userLoginService.selectOne(userLoginEntityWrapper);
+            //判断当前执行人是谁，项目负责人/分管领导/主要领导
+            EntityWrapper<ProjectQuarterlyEvaluation> evaluationEntityWrapper = new EntityWrapper<>();
+            evaluationEntityWrapper.eq("is_deleted", "0");
+            evaluationEntityWrapper.and("ext_->> 'executor'= " + "'" + userId + "'");//根据当前执行人查询
+//            evaluationEntityWrapper.andNew()
+//                    .eq("created_by", String.valueOf(systemUserLogin.getUserinfoId()))
+//                    .or("ext_->> 'projectAdmin'= " + "'" + userId + "'")
+//                    .or("ext_->> 'branchLeaders'= " + "'" + userId + "'")
+//                    .or("ext_->> 'MainLeader'= " + "'" + userId + "'");
+            evaluationEntityWrapper.setSqlSelect("project_id");
+            List<Object> evaluationList = quarterlyEvaluationService.selectObjs(evaluationEntityWrapper);
+            Page<ProjectInfo> page = new Page<>(pageNoUtil.getPageNo(), pageNoUtil.getPageSize());
+            List<ProjectInfoListItemResp> list = new ArrayList<>();
+            //通过季度审核表的项目id集合，查询到当前负责人下面的项目列表
+            if (!ObjectUtils.isEmpty(evaluationList)) {
+                list = projectInfoService.getListByIds(page, evaluationList);
+            }
+            ResultListReqUtil<ProjectInfoListItemResp> listReqUtil = new ResultListReqUtil<>(list, page.getPages(), page.getTotal());
+            return ApiResponse.fillSuccess(listReqUtil);
+        } catch (Exception e) {
+            log.error("ProjectQuarterlyEvaluationController.list", e);
+            throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null);
+        }
     }
 }
diff --git a/src/main/java/com/xqopen/kehui/project/api/ProjectAssessmentIndicatorsApi.java b/src/main/java/com/xqopen/kehui/project/api/ProjectAssessmentIndicatorsApi.java
index 377eda9..8cb28c7 100644
--- a/src/main/java/com/xqopen/kehui/project/api/ProjectAssessmentIndicatorsApi.java
+++ b/src/main/java/com/xqopen/kehui/project/api/ProjectAssessmentIndicatorsApi.java
@@ -10,6 +10,8 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.Map;
+
 @Api(value = "季度考核指标管理", tags = Constants.MODULE_PROJECT, description = "项目模块")
 public interface ProjectAssessmentIndicatorsApi {
     @ApiOperation(value = "获取季度考核指标列表", notes = "获取季度考核指标列表", response = ProjectAchievementResp.class)
@@ -18,4 +20,11 @@ public interface ProjectAssessmentIndicatorsApi {
             @ApiImplicitParam(name = "userId", value = "用户id", required = true, paramType = "header", dataType = "Long"),
     })
     String list(Long userId, PageNoUtil<ProjectAssessmentIndicators> pageNoUtil) throws XQException;
+    @ApiOperation(value = "修改季度考核指标(包含打分)", notes = "修改季度考核指标", response = ProjectAchievementResp.class)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "token", value = "登录标识符", required = true, paramType = "header", dataType = "String"),
+            @ApiImplicitParam(name = "userId", value = "用户id", required = true, paramType = "header", dataType = "Long"),
+    })
+    String update(Long userId,PageNoUtil<ProjectAssessmentIndicators> pageNoUtil) throws XQException;
+    String examine(Long userId, Map map) throws XQException;
 }
diff --git a/src/main/java/com/xqopen/kehui/project/entity/ProjectAssessmentIndicators.java b/src/main/java/com/xqopen/kehui/project/entity/ProjectAssessmentIndicators.java
index 7ae9921..44447cf 100644
--- a/src/main/java/com/xqopen/kehui/project/entity/ProjectAssessmentIndicators.java
+++ b/src/main/java/com/xqopen/kehui/project/entity/ProjectAssessmentIndicators.java
@@ -1,6 +1,6 @@
 package com.xqopen.kehui.project.entity;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
@@ -38,5 +38,5 @@ public class ProjectAssessmentIndicators {
     @ApiModelProperty("序号")
     private Long number;
     @TableField("ext_")
-    private JSON ext;
+    private JSONObject ext;
 }
diff --git a/src/main/java/com/xqopen/kehui/project/entity/ProjectQuarterlyEvaluation.java b/src/main/java/com/xqopen/kehui/project/entity/ProjectQuarterlyEvaluation.java
index 9c33060..b8d9429 100644
--- a/src/main/java/com/xqopen/kehui/project/entity/ProjectQuarterlyEvaluation.java
+++ b/src/main/java/com/xqopen/kehui/project/entity/ProjectQuarterlyEvaluation.java
@@ -1,6 +1,8 @@
 package com.xqopen.kehui.project.entity;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
@@ -29,7 +31,8 @@ public class ProjectQuarterlyEvaluation implements Serializable {
     /**
      * 
      */
-    private Object ext;
+    @TableField("ext_")
+    private JSONObject ext;
 
     /**
      * 
diff --git a/src/main/java/com/xqopen/kehui/util/ApiResponse.java b/src/main/java/com/xqopen/kehui/util/ApiResponse.java
index 85bf694..48083ab 100644
--- a/src/main/java/com/xqopen/kehui/util/ApiResponse.java
+++ b/src/main/java/com/xqopen/kehui/util/ApiResponse.java
@@ -45,7 +45,12 @@ public class ApiResponse {
 		jsonObject.put("data", result);
 		return JSON.toJSONString(jsonObject, SerializerFeature.BrowserCompatible);
 	}
-
+	public static String fillFail() {
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("status", -1);
+		jsonObject.put("data", "操作失败！");
+		return JSON.toJSONString(jsonObject, SerializerFeature.BrowserCompatible);
+	}
 	/**
 	 *
 	 * @param result