FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-02-16 18:01:19 +08:00
parent 15ab163b6e b5d407c00f
commit 8386384782
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyAfter.java
+1 -2
View File
@@ -50,12 +50,11 @@ public class StartSurveyAfter implements TaskListener {
String standName= object1.getString("standId");
delegateTask.setVariable("number",standName);
String prcName = standName+"-未符合项整改";
String prcName = standName+"-"+object1.getString("standName")+"-未符合项整改";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("8");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java
+16 -1
View File
@@ -13,7 +13,9 @@ import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class ProcessstartAfter implements TaskListener {
@@ -48,7 +50,20 @@ public class ProcessstartAfter implements TaskListener {
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
String prcName = "企标制修订计划-部门高级经理审批";
//1合并 2延期 3取消 4更名 5立项
String prcName = "";
String type=object.getString("type");
if ("5".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划立项";
}else if ("2".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划延期";
}else if ("1".equals(type)){
prcName=object.getString("bussSort")+"-"+object.getString("esName")+"-计划合并";
}else if ("3".equals(type)){
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("esName")+"-计划取消";
}else {
prcName=object.getJSONArray("bussSort").get(0).toString()+"-"+object.getString("renameEs")+"-计划更名";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7After.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class Step7After implements TaskListener {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setMesg(delegateTask.getVariable("Step7Res",JSONObject.class).toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());