diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java index 93773ca4..2f87fedf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java @@ -32,6 +32,7 @@ public class PCAComplianceAssessmentAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + delegateTask.setVariable("GOGOGO","1"); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java index f0186a2a..98d58e80 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java @@ -24,7 +24,6 @@ public class PCAComplianceAssessmentBefore implements TaskListener { queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); if ("GO".equals(delegateTask.getVariable("GOGOGO"))) { queryWrapper1.eq("TASK_ID", "GO"); - delegateTask.setVariable("GOGOGO","1"); }else { queryWrapper1.isNull("TASK_ID"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index d7830822..a56670de 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -100,19 +100,21 @@ public class DeptApplayAfter implements TaskListener{ }); JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class)); - jsonArray1.forEach(obj ->{ - JSONObject object1 = JSONObject.parseObject(obj.toString()); - SarStandItems sarStandItems1=new SarStandItems(); - sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly",String.class)); - sarStandItems1.setStandId(object.getString("standId")); - sarStandItems1.setItemsNum(object1.getString("itemsNum")); - sarStandItems1.setItemsName(object1.getString("itemsName")); - sarStandItems1.setResponsibleUnit(object1.getString("responsibleUnitShow")); - sarStandItems1.setDutyEngineer(object1.getString("zxUserIdName")); - sarStandItems1.setTermsConditions(object1.getString("itermsConditions")); - sarStandItems1.setReadContent(object1.getString("technicalRequir")); - sarStandItems.add(sarStandItems1); - }); + if (null!=jsonArray1 && jsonArray1.size()>0) { + jsonArray1.forEach(obj -> { + JSONObject object1 = JSONObject.parseObject(obj.toString()); + SarStandItems sarStandItems1 = new SarStandItems(); + sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly", String.class)); + sarStandItems1.setStandId(object.getString("standId")); + sarStandItems1.setItemsNum(object1.getString("itemsNum")); + sarStandItems1.setItemsName(object1.getString("itemsName")); + sarStandItems1.setResponsibleUnit(object1.getString("responsibleUnitShow")); + sarStandItems1.setDutyEngineer(object1.getString("zxUserIdName")); + sarStandItems1.setTermsConditions(object1.getString("itermsConditions")); + sarStandItems1.setReadContent(object1.getString("technicalRequir")); + sarStandItems.add(sarStandItems1); + }); + } //标准状态修改 SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO(); sarFileSplitInfoEO.setSplitStatus("4"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java index dfcc5f85..2b4cb602 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java @@ -99,13 +99,11 @@ public class ResolveAfter implements TaskListener{ // busBean.save(busProcessNew); if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ //2次 -// List listRes = userGroupMap.get(nextUser); -// object.put("itemList", JSON.toJSONString(listRes)); - + List listRes = userGroupMap.get(nextUser); + object.put("itemList", JSON.toJSONString(listRes)); BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - //busProcessNewNext.setMesg(StringEscapeUtils.unescapeJavaScript(object.toJSONString()));//返转义函数 busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0");