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 b14a44f0..d7830822 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 @@ -43,6 +43,19 @@ public class DeptApplayAfter implements TaskListener{ delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); + + String standName = ""; + if (null == object.getString("standInData")){ + standName = "未知"; + }else { + if(object.getString("standInData").equals("INLAND")){ + standName = "国内"; + }else { + standName = "海外"; + } + } + String prcName = standName+"-标准解读流程"; + //部长进行审批(1:通过) if (object.getString("gcApplyFlag").equals("1")) { delegateTask.setVariable("bzFlag", 1); @@ -108,24 +121,16 @@ public class DeptApplayAfter implements TaskListener{ lawsUserInfoService.sarStandItemsSaveBatch(sarStandItems); lawsUserInfoService.SarInterpretationNationalStandardSaveBatch(standards); + prcName=prcName+"-流程结束"; } else { delegateTask.setVariable("bzFlag", 2); + prcName=prcName+"-填写解读分析"; } //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); - String standName = ""; - if (null == object.getString("standInData")){ - standName = "未知"; - }else { - if(object.getString("standInData").equals("INLAND")){ - standName = "国内"; - }else { - standName = "海外"; - } - } - String prcName = standName+"-标准解读流程"; + QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java index a94b9e78..64013a9d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java @@ -67,7 +67,7 @@ public class DeptZrAfter implements TaskListener{ standName = "海外"; } } - String prcName = standName+"-标准解读流程"; + String prcName = standName+"-标准解读流程-填写解读分析"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java index b6f9c16d..e3614f93 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java @@ -36,22 +36,7 @@ public class EngineerApplayAfter implements TaskListener{ delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); - //工程师是否要进行审核 - if (object.getString("zrApplyFlag").equals("1")) { - delegateTask.setVariable("gcFlag", 1); - if (StringUtils.isNotBlank(object.getString("deptUserId"))) { - delegateTask.setVariable("deptUserId", object.getString("deptUserId")); - nextUserList.add(object.getString("deptUserId")); - } - } else { - delegateTask.setVariable("gcFlag", 2); - JSONObject object1=delegateTask.getVariable("zxUserId",JSONObject.class); - nextUserList.add(object1.getString("id")); - } - //截止时间 流程描述 创建人 - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("applyUserId"); - String username = object.getString("applyUserIdName"); + String standName = ""; if (null == object.getString("standInData")){ standName = "未知"; @@ -63,6 +48,26 @@ public class EngineerApplayAfter implements TaskListener{ } } String prcName = standName + "-标准解读流程"; + + //工程师是否要进行审核 + if (object.getString("zrApplyFlag").equals("1")) { + delegateTask.setVariable("gcFlag", 1); + prcName=prcName+"-部长审批"; + if (StringUtils.isNotBlank(object.getString("deptUserId"))) { + delegateTask.setVariable("deptUserId", object.getString("deptUserId")); + nextUserList.add(object.getString("deptUserId")); + } + } else { + prcName=prcName+"-填写解读分析"; + delegateTask.setVariable("gcFlag", 2); + JSONObject object1=delegateTask.getVariable("zxUserId",JSONObject.class); + nextUserList.add(object1.getString("id")); + } + //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("applyUserId"); + String username = object.getString("applyUserIdName"); + QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java index e840a25b..abc8a166 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java @@ -51,7 +51,7 @@ public class ExpainAfter implements TaskListener{ standName = "海外"; } } - String prcName = standName+"-标准解读流程"; + String prcName = standName+"-标准解读流程-责任人审核"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); 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 45f33539..25b5dea8 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 @@ -74,7 +74,7 @@ public class ResolveAfter implements TaskListener{ standName = "海外"; } } - String prcName = standName+"-标准解读流程"; + String prcName = standName+"-标准解读流程-选择执行人"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java index 894184e2..bf0769ce 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java @@ -36,22 +36,6 @@ public class ZrApplayAfter implements TaskListener{ delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - //责任人是否要进行审核 - if(object.getString("resolveFlag").equals("1")){ - delegateTask.setVariable("zrFlag",1); - if(StringUtils.isNotBlank(object.getString("applyUserId"))){ - delegateTask.setVariable("engineerUserId",object.getString("applyUserId")); - nextUserList.add(object.getString("applyUserId")); - } - }else { - delegateTask.setVariable("zrFlag",2); - JSONObject object1=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("zxUserId"))); - nextUserList.add(String.valueOf(object1.getString("id"))); - } - //截止时间 流程描述 创建人 - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("applyUserId"); - String username = object.getString("applyUserIdName"); String standName = ""; if (null == object.getString("standInData")){ standName = "未知"; @@ -63,6 +47,24 @@ public class ZrApplayAfter implements TaskListener{ } } String prcName = standName+"-标准解读流程"; + //责任人是否要进行审核 + if(object.getString("resolveFlag").equals("1")){ + delegateTask.setVariable("zrFlag",1); + prcName=prcName+"-工程师审核"; + if(StringUtils.isNotBlank(object.getString("applyUserId"))){ + delegateTask.setVariable("engineerUserId",object.getString("applyUserId")); + nextUserList.add(object.getString("applyUserId")); + } + }else { + prcName=prcName+"-填写解读分析"; + delegateTask.setVariable("zrFlag",2); + JSONObject object1=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("zxUserId"))); + nextUserList.add(String.valueOf(object1.getString("id"))); + } + //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("applyUserId"); + String username = object.getString("applyUserIdName"); QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);