diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java index f56b1308..263b4359 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java @@ -11,6 +11,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.Arrays; @@ -52,17 +53,17 @@ public class ProcessStep1After implements TaskListener { String user = delegateTask.getVariable("prcCreateUser",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); String prcName = ""; - if ("1".equals(object.getString("passFlag"))) { - prcName = "企标废止流程-流程结束"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("entCategory"))){ + prcName = object.getString("entCategory")+"-"+object.getString("standName") + "-企标废止"; }else { - prcName = "企标废止流程-会签"; + prcName = "企标废止"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("24"); -// one1.setPrcName(prcName); + one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java index 6db9d0a7..5daa9034 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java @@ -13,6 +13,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.Arrays; @@ -64,13 +65,18 @@ public class ProcessStep2After implements TaskListener { //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = "企标废止流程-起草人修改标准状态"; + String prcName = ""; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("entCategory"))){ + prcName = object.getString("entCategory")+"-"+object.getString("standName") + "-企标废止"; + }else { + prcName = "企标废止"; + } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("24"); -// one1.setPrcName(prcName); + one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java index bc9657e2..7b63a2e7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java @@ -11,6 +11,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.List; @@ -41,13 +42,18 @@ public class ProcessStep3After implements TaskListener { //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName = "企标废止流程-标准法规部部长审核"; + String prcName = ""; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("entCategory"))){ + prcName = object.getString("entCategory")+"-"+object.getString("standName") + "-企标废止"; + }else { + prcName = "企标废止"; + } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("24"); -// one1.setPrcName(prcName); + one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java index 92e80583..79ccb83c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java @@ -11,6 +11,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.List; @@ -47,18 +48,18 @@ public class ProcessStep4After implements TaskListener { //截止时间 流程描述 创建人 String user = delegateTask.getVariable("prcCreateUser",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); - String prcName=""; - if ("0".equals(object.getString("bzFlag"))){ - prcName = "企标废止流程-审定责任人审定"; + String prcName = ""; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("entCategory"))){ + prcName = object.getString("entCategory")+"-"+object.getString("standName") + "-企标废止"; }else { - prcName = "企标废止流程-起草人修改标准状态"; + prcName = "企标废止"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("24"); -// one1.setPrcName(prcName); + one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java index d6971ddd..ab2f34bd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java @@ -11,6 +11,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.List; @@ -48,17 +49,17 @@ public class ProcessStep5After implements TaskListener { String user = delegateTask.getVariable("prcCreateUser",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); String prcName = ""; - if ("0".equals(object.getString("sdFlag"))){ - prcName = "企标废止流程-批准负责人审批"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("entCategory"))){ + prcName = object.getString("entCategory")+"-"+object.getString("standName") + "-企标废止"; }else { - prcName = "企标废止流程-起草人修改标准状态"; + prcName = "企标废止"; } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setPrcType("24"); -// one1.setPrcName(prcName); + one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java index cce7bd37..3b8ae018 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java @@ -14,6 +14,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -59,10 +60,10 @@ public class ProcessStep6After implements TaskListener { String user = delegateTask.getVariable("prcCreateUser",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class); String prcName = ""; - if ("0".equals(object.getString("sdFlag"))){ - prcName = "企标废止流程-批准负责人审批"; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("entCategory"))){ + prcName = object.getString("entCategory")+"-"+object.getString("standName") + "-企标废止"; }else { - prcName = "企标废止流程-起草人修改标准状态"; + prcName = "企标废止"; } String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); QueryWrapper queryWrapper2 = new QueryWrapper(); @@ -73,7 +74,7 @@ public class ProcessStep6After implements TaskListener { one1.setOverTime(OVERTIME); } one1.setPrcType("24"); -// one1.setPrcName(prcName); + one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartAfter.java index a6ef7053..a3b39684 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartAfter.java @@ -11,6 +11,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.List; @@ -52,7 +53,12 @@ public class ProcessstartAfter implements TaskListener { String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String prcName = "企标废止流程-标准法规部部长审核"; + String prcName = ""; + if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("entCategory"))){ + prcName = object.getString("entCategory")+"-"+object.getString("standName") + "-企标废止"; + }else { + prcName = "企标废止"; + } QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);