From 108b6ffbc100774ba3ef32155b49aeda797c482f Mon Sep 17 00:00:00 2001 From: zty <1048209592@qq.com> Date: Tue, 16 Jul 2024 17:42:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AD=A3=E5=BA=A6=E5=AE=A1=E6=A0=B8=E8=AF=84?= =?UTF-8?q?=E5=88=86=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8B=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=202.=E9=A1=B9=E7=9B=AE=E8=80=83=E6=A0=B8=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E6=96=B9?= =?UTF-8?q?=E6=B3=95=203.=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7=E5=8F=8A=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=94=AF=E4=B8=80=E5=88=A4=E6=96=AD=204.=E5=AD=A3?= =?UTF-8?q?=E5=BA=A6=E5=AE=A1=E6=A0=B8=E8=AF=84=E5=88=86=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=BB=93=E6=9D=9F=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kehui/mapper/ProjectAssessmentIndicatorsDao.java | 2 +- .../action/ProjectAssessmentIndicatorsController.java | 3 --- .../kehui/project/action/ProjectInitComtroller.java | 9 +++++++++ .../action/ProjectQuarterlyEvaluationController.java | 4 +++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/xqopen/kehui/mapper/ProjectAssessmentIndicatorsDao.java b/src/main/java/com/xqopen/kehui/mapper/ProjectAssessmentIndicatorsDao.java index 1ced35c..b00ecfe 100644 --- a/src/main/java/com/xqopen/kehui/mapper/ProjectAssessmentIndicatorsDao.java +++ b/src/main/java/com/xqopen/kehui/mapper/ProjectAssessmentIndicatorsDao.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Update; import java.util.List; public interface ProjectAssessmentIndicatorsDao extends BaseMapper { - @Update("update project_assessment_indicators set is_deleted=true where project_id =#{id}") + @Update("update project_assessment_indicators set is_deleted='1' where project_id =#{id}") void updateByProjectId(Long id); List getList(Page page, @Param("indicators") ProjectAssessmentIndicators indicators); } 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 efb645f..5d635d6 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectAssessmentIndicatorsController.java @@ -167,9 +167,6 @@ public class ProjectAssessmentIndicatorsController implements ProjectAssessmentI 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())); 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 a0cd2c4..b4d5b69 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectInitComtroller.java @@ -127,6 +127,15 @@ public class ProjectInitComtroller implements ProjectInitApi { ProjectInfoReq infoReq = initDto.getProjectInfoReq(); try { ProjectInfo info = new JacksonUtil().setAddEntity(userId, infoReq, ProjectInfo.class); + EntityWrapper wrapper = new EntityWrapper<>(); + wrapper.eq("project_name",info.getProjectName()); + wrapper.eq("project_no",info.getProjectNo()); + wrapper.eq("project_category","init"); + wrapper.eq("is_deleted",false); + List infos = projectInfoService.selectList(wrapper); + if(!ObjectUtils.isEmpty(infos)){ + return ApiResponse.fillFail("项目名称/编号已存在！"); + } infoService.insert(info); //批量新增项目考核季度表 if (!ObjectUtils.isEmpty(initDto)) { 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 27bf788..18f2aee 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java @@ -47,7 +47,9 @@ public class ProjectQuarterlyEvaluationController implements ProjectQuarterlyEva //判断当前执行人是谁，项目负责人/分管领导/主要领导 EntityWrapper evaluationEntityWrapper = new EntityWrapper<>(); evaluationEntityWrapper.eq("is_deleted", "0"); - evaluationEntityWrapper.and("ext_->> 'executor'= " + "'" + userId + "'");//根据当前执行人查询 + evaluationEntityWrapper.and("ext_->> 'executor'= " + "'" + userId + "'"); + evaluationEntityWrapper.and("ext_->> 'taskName'!='流程结束'"); + //根据当前执行人查询 // evaluationEntityWrapper.andNew() // .eq("created_by", String.valueOf(systemUserLogin.getUserinfoId())) // .or("ext_->> 'projectAdmin'= " + "'" + userId + "'")