From 7bdc71502016d9924e998d6e6273a596c281021b Mon Sep 17 00:00:00 2001 From: zty <1048209592@qq.com> Date: Wed, 14 Aug 2024 11:07:21 +0800 Subject: [PATCH] =?UTF-8?q?1.1=3D1=E4=BF=AE=E6=94=B9=E4=B8=BAwhere?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=202.=E7=A0=94=E7=A9=B6=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=B1=BB/=E8=87=AA=E4=B8=BB=E7=A0=94=E5=8F=91=E7=B1=BB?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=96=E6=B6=88=E5=A1=AB=E6=8A=A5=EF=BC=8C?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E5=9D=87=E5=8F=AF=E4=BB=A5=E8=B5=B0=E5=AE=8C=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=203.=E7=AB=8B=E9=A1=B9=E7=BB=93=E6=9D=9F=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=89=A7=E8=A1=8C=E4=BA=BA=E5=A2=9E=E5=8A=A0=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=83=A8=E4=B8=BB=E4=BB=BBid=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=AF=E5=8A=9E=E5=85=AC=E5=AE=A4=E9=83=A8=E9=97=A8=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kehui/flows/util/ProjectInitListener.java | 52 ++++++++++--------- .../kehui/mapper/xml/ProjectInfoDao.xml | 4 +- 2 files changed, 31 insertions(+), 25 deletions(-) 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 7e191a5..8e4f0e6 100644 --- a/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java +++ b/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java @@ -76,15 +76,15 @@ public class ProjectInitListener implements ExecutionListener { JSONObject ext = projectInfo.getExt(); //研究开发类/自主研发类没有填报直接结项 - String openRange = String.valueOf(ext.get("openRange")); - if ("3".equals(openRange) || "7".equals(openRange)) { - return; - } +// String openRange = String.valueOf(ext.get("openRange")); +// if ("3".equals(openRange) || "7".equals(openRange)) { +// return; +// } //根据部门批量添加部门周报填报 JSONArray depts = (JSONArray) ext.get("executeDepts"); ArrayList weeklyArrayList = new ArrayList<>(); - if (!ObjectUtils.isEmpty(depts)) { + if (!ObjectUtils.isEmpty(depts)) { // depts.forEach(a -> { // ProjectWeekly projectWeekly = new ProjectWeekly(); // projectWeekly.setProjectId(String.valueOf(projectInfo.getId())); @@ -132,25 +132,20 @@ public class ProjectInitListener implements ExecutionListener { // jsonObject.put("MainLeader",getSystemUserLogin(String.valueOf(MainLeader.get(1))).getId()); // jsonObject.put("executor",getSystemUserLogin(projectManager).getId()); String executor = getExecutor(); - StringBuffer stringBuffer = new StringBuffer(executor); - stringBuffer.append(",").append(jsonObject.get("projectManager")); - stringBuffer.append(",").append(jsonObject.get("projectAdmin")); - stringBuffer.append(",").append(jsonObject.get("branchLeaders")); - stringBuffer.append(",").append(jsonObject.get("MainLeader")); - executor = new String(stringBuffer); - jsonObject.put("executor", executor); + StringBuffer stringBuffer = new StringBuffer(executor);//四个部门主任id + StringBuffer buffer = new StringBuffer(); //项目立项执行人id + buffer.append(projectInfo.getCreatedBy()); + buffer.append(",").append(jsonObject.get("projectManager")); + buffer.append(",").append(jsonObject.get("projectAdmin")); + buffer.append(",").append(jsonObject.get("branchLeaders")); + buffer.append(",").append(jsonObject.get("MainLeader")); + executor = new String(stringBuffer.append(",").append(buffer)); jsonObject.put("taskName", "季度审核填报"); - 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", executor); - infoExt.put("endExecutor",String.valueOf(projectInfo.getCreatedBy()));//结项的第一个节点的委托人一定是项目专员也就是立项的创建人 - infoExt.put("endHistorical",infoExt.get("endExecutor"));//添加第一个历史委托人 -// infoExt.put("executor",getSystemUserLogin(projectManager).getId());//当前委托人 + infoExt.put("endExecutor", String.valueOf(projectInfo.getCreatedBy()));//结项的第一个节点的委托人一定是项目专员也就是立项的创建人 + infoExt.put("endHistorical", infoExt.get("endExecutor"));//添加第一个历史委托人 //判断项目负责人是否是办公室部门的 EntityWrapper orgEntityWrapper = new EntityWrapper<>(); orgEntityWrapper.eq("is_deleted", false); @@ -164,10 +159,19 @@ public class ProjectInitListener implements ExecutionListener { PersonalMember personalMember = personalMemberService.selectOne(memberEntityWrapper); if (!ObjectUtils.isEmpty(personalMember)) { infoExt.put("isOffice", "0"); + infoExt.put("executor", executor); + jsonObject.put("executor", executor); } else { infoExt.put("isOffice", "1"); + infoExt.put("executor", buffer); + jsonObject.put("executor", buffer); } } + quarterlyEvaluation.setExt(jsonObject); + quarterlyEvaluation.setCreatedAt(new Timestamp(System.currentTimeMillis())); + quarterlyEvaluation.setProjectId(String.valueOf(projectInfo.getId())); + projectQuarterlyEvaluationService.insert(quarterlyEvaluation); + if (!StringUtils.isEmpty(projectInfo.getId())) { projectInfoService.updateById(projectInfo); @@ -177,11 +181,11 @@ public class ProjectInitListener implements ExecutionListener { assessmentIndicatorsEntityWrapper.eq("project_id", projectInfo.getId()); List indicatorsList = projectAssessmentIndicatorsService.selectList(assessmentIndicatorsEntityWrapper); if (!ObjectUtils.isEmpty(indicatorsList)) { - indicatorsList.forEach(a->{ + indicatorsList.forEach(a -> { JSONObject aExt = a.getExt(); - aExt.put("branchLeaders",branchLeaders.get(0)); - aExt.put("MainLeader",MainLeader.get(0)); - aExt.put("projectAdmin",projectAdmin.get(0)); + aExt.put("branchLeaders", branchLeaders.get(0)); + aExt.put("MainLeader", MainLeader.get(0)); + aExt.put("projectAdmin", projectAdmin.get(0)); a.setExt(aExt); }); projectAssessmentIndicatorsService.updateAllColumnBatchById(indicatorsList); 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 10d6ec2..6d34d5d 100644 --- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml +++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectInfoDao.xml @@ -146,13 +146,15 @@ AND f.activiti_status=2 AND f.is_deleted=FALSE