From 4156adc6d100f36b33bf627cf23776b37f0ed530 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 2 Dec 2021 15:38:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemlistvalidationprocess/Step3After.java | 32 ++++++++----------- .../PEPffresPersonAfter.java | 9 ++++-- .../PEPtaskEstimateAfter.java | 10 +++--- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java index a1844207..4e8a8a17 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java @@ -36,22 +36,21 @@ public class Step3After implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - if ("0".equals(object.getString("passFlag"))) { - delegateTask.setVariable("passFlag","0"); - List standProjectRelationDtos = new ArrayList<>(); - JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList")); - for (Object os : jsonArray) { - JSONObject jsonObject = JSONObject.parseObject(os.toString()); - StandProjectRelationDto standProjectRelationDto = new StandProjectRelationDto(); - standProjectRelationDto.setProjectId(object.getString("projectId")); - standProjectRelationDto.setStandId(jsonObject.getString("id")); - standProjectRelationDtos.add(standProjectRelationDto); - } - lawsUserInfoService.batchInsert(standProjectRelationDtos); + //设计一个确认人的计数器 + if (null!=delegateTask.getVariable("count")){ + delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)+1); }else { - delegateTask.setVariable("passFlag","1"); - nextUserList.add(delegateTask.getVariable("confirmId",String.class)); + delegateTask.setVariable("count",1); } + //判断是否为最后一步 决定数据是否需要合并***---*** + + + + + + + + //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); @@ -61,17 +60,12 @@ public class Step3After implements TaskListener { queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ - if ("0".equals(object.getString("passFlag"))) { - one1.setOverTime(OVERTIME); - } one1.setPrcType("10"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - - if(!nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNewNext = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java index 4d1efc4a..b1416a74 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java @@ -45,7 +45,10 @@ public class PEPffresPersonAfter implements TaskListener { delegateTask.setVariable("objectJson", object); String prcName = ""; - if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) { + if ("2".equals(object.getString("fenFlag")) && null == delegateTask.getVariable("PEPCount") && delegateTask.getVariable("workPeoples", List.class).size()==1){ + prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批"; + } + else if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) { prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批"; } else { prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-合规性评估"; @@ -69,7 +72,7 @@ public class PEPffresPersonAfter implements TaskListener { nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("workPeople", String.valueOf(delegateTask.getVariable("workPeople"))); delegateTask.setVariable("fenFlag", "2"); - + object.put("mark","back"); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -125,7 +128,7 @@ public class PEPffresPersonAfter implements TaskListener { List busProcessNews=busBean.findLastworkPeople("projectEvaluationProcess5",delegateTask.getProcessInstanceId()); for (BusProcessNew b:busProcessNews) { JSONObject object=JSONObject.parseObject(b.getMesg()); - if (!"1".equals(object.getString("fenFlag"))) { + if ("".equals(b.getCommitText())) { JSONArray jsonArray = JSONArray.parseArray(object.getString("step3DTOS")); JSONArray dataList = JSONArray.parseArray(object.getString("dataList")); //去除jaonArry中的无效数据 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java index edd421c5..1f83bd38 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java @@ -45,9 +45,7 @@ public class PEPtaskEstimateAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList")); - //代码放这不带数据 - JSONArray ne=new JSONArray(); - ne.addAll(jsonArray); + JSONArray ne = JSONArray.parseArray(object.getString("dataList")); //操作数据库 JSONArray remove = new JSONArray(); for (Object json : jsonArray) { @@ -59,9 +57,9 @@ public class PEPtaskEstimateAfter implements TaskListener { } String uuid = String.valueOf(UUID.randomUUID()); //代码放这带数据 - delegateTask.setVariable(uuid, ne); - jsonArray.removeAll(remove); - object.put("dataList", jsonArray); + delegateTask.setVariable(uuid, jsonArray); + ne.removeAll(remove); + object.put("dataList", ne); object.put("key", uuid); //设置分发负责人 List nextUserList = new ArrayList();