From 5b3cb53cb9a9dbc7930218115ba6f73f437df7c0 Mon Sep 17 00:00:00 2001 From: zty <1048209592@qq.com> Date: Fri, 12 Jul 2024 09:52:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9=E5=AD=A3?= =?UTF-8?q?=E5=BA=A6=E8=80=83=E6=A0=B8=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=8C=E5=B9=B3=E5=8F=B0=E4=B8=93=E9=A1=B9/=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E8=B4=A3=E4=BB=BB=E6=89=8D=E6=9C=89=E5=AD=A3=E5=BA=A6?= =?UTF-8?q?=E8=80=83=E6=A0=B8=202.=E5=AD=A3=E5=BA=A6=E8=80=83=E6=A0=B8?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0ext=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kehui/flows/util/ProjectInitListener.java | 79 ++++++++++--------- .../xml/ProjectQuarterlyEvaluationMapper.xml | 2 +- 2 files changed, 44 insertions(+), 37 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 4a549de..cab22cf 100644 --- a/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java +++ b/src/main/java/com/xqopen/kehui/flows/util/ProjectInitListener.java @@ -60,47 +60,54 @@ public class ProjectInitListener implements ExecutionListener { } //根据部门批量添加部门周报填报 -// JSONArray depts = (JSONArray) ext.get("executeDepts"); + JSONArray depts = (JSONArray) ext.get("executeDepts"); ArrayList weeklyArrayList = new ArrayList<>(); -// if (!ObjectUtils.isEmpty(depts)) { -// depts.forEach(a -> { -// ProjectWeekly projectWeekly = new ProjectWeekly(); -// projectWeekly.setProjectId(String.valueOf(projectInfo.getId())); -// projectWeekly.setWeeklyType("1"); -// projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis())); -// projectWeekly.setDeptId(a.toString()); -// weeklyArrayList.add(projectWeekly); -// }); + if (!ObjectUtils.isEmpty(depts)) { + depts.forEach(a -> { + ProjectWeekly projectWeekly = new ProjectWeekly(); + projectWeekly.setProjectId(String.valueOf(projectInfo.getId())); + projectWeekly.setWeeklyType("1"); + projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis())); + projectWeekly.setDeptId(a.toString()); + weeklyArrayList.add(projectWeekly); + }); - //添加项目专员/负责人假数据，方便周报填报页面查看所有（暂时） - String draftManId = String.valueOf(ext.get("draftManId")); - JSONArray projectManagerData = (JSONArray) ext.get("projectManagerData"); - String projectManager = String.valueOf(projectManagerData.get(1)); - ArrayList list = new ArrayList<>(); - list.add(draftManId); - if (!draftManId.equals(projectManager)) list.add(projectManager);//避免角色是同一个人重复 - list.forEach(a -> { - ProjectWeekly projectWeekly = new ProjectWeekly(); - projectWeekly.setProjectId(String.valueOf(projectInfo.getId())); - projectWeekly.setWeeklyType("1"); - projectWeekly.setDeptId(""); - projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis())); - projectWeekly.setIsDeleted("1"); - projectWeekly.setUserId(a); - projectWeekly.setCreatedBy(a); - weeklyArrayList.add(projectWeekly); - }); - projectWeeklyService.insertBatch(weeklyArrayList); + //添加项目专员/负责人假数据，方便周报填报页面查看所有（暂时） + String draftManId = String.valueOf(ext.get("draftManId")); + JSONArray projectManagerData = (JSONArray) ext.get("projectManagerData"); + String projectManager = String.valueOf(projectManagerData.get(1)); + ArrayList list = new ArrayList<>(); + list.add(draftManId); + if (!draftManId.equals(projectManager)) list.add(projectManager);//避免角色是同一个人重复 + list.forEach(a -> { + ProjectWeekly projectWeekly = new ProjectWeekly(); + projectWeekly.setProjectId(String.valueOf(projectInfo.getId())); + projectWeekly.setWeeklyType("1"); + projectWeekly.setDeptId(""); + projectWeekly.setCreatedAt(new Timestamp(System.currentTimeMillis())); + projectWeekly.setIsDeleted("1"); + projectWeekly.setUserId(a); + projectWeekly.setCreatedBy(a); + weeklyArrayList.add(projectWeekly); + }); + projectWeeklyService.insertBatch(weeklyArrayList); - //添加季度审核数据 - ProjectQuarterlyEvaluation quarterlyEvaluation = new ProjectQuarterlyEvaluation(); - quarterlyEvaluation.setCreatedBy(projectManager); - quarterlyEvaluation.setCreatedAt(new Timestamp(System.currentTimeMillis())); - quarterlyEvaluation.setProjectId(String.valueOf(projectInfo.getId())); - projectQuarterlyEvaluationService.insert(quarterlyEvaluation); + //平台专项类/目标责任类才有季度考核 + //添加季度审核数据 + if ("5".equals(openRange) || "6".equals(openRange)) { + ProjectQuarterlyEvaluation quarterlyEvaluation = new ProjectQuarterlyEvaluation(); + quarterlyEvaluation.setCreatedBy(projectManager); + JSONArray projectAdmin = (JSONArray) ext.get("projectAdmin"); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("projectAdmin",projectAdmin.get(1)); + quarterlyEvaluation.setExt(jsonObject); + quarterlyEvaluation.setCreatedAt(new Timestamp(System.currentTimeMillis())); + quarterlyEvaluation.setProjectId(String.valueOf(projectInfo.getId())); + projectQuarterlyEvaluationService.insert(quarterlyEvaluation); + } + } } } -// } } catch (Exception e) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); log.error("ProjectInitListener.notify", e); diff --git a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectQuarterlyEvaluationMapper.xml b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectQuarterlyEvaluationMapper.xml index 99f93a5..ea77ba9 100644 --- a/src/main/java/com/xqopen/kehui/mapper/xml/ProjectQuarterlyEvaluationMapper.xml +++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectQuarterlyEvaluationMapper.xml @@ -7,7 +7,7 @@ - +