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:
Mr.Z
2021-08-12 18:10:45 +08:00
parent 7571f8057d 78bbd4e9f0
commit 3cd9ed3012
8 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java
+38 -20
View File
@@ -36,7 +36,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
if(delegateTask.getVariable("actionFlag",Integer.class)==0){ if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if("1".equals(object.getString("actionFlag"))){ if("1".equals(object.getString("actionFlag"))){
delegateTask.setVariable("actionFlag",1); delegateTask.setVariable("actionFlag",1);
nextUserList.add(delegateTask.getVariable("startUser",String.class)); // nextUserList.add(delegateTask.getVariable("startUser",String.class));
} }
} }
@@ -82,6 +82,10 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busBean.update(busProcessNew,updataWapper); busBean.update(busProcessNew,updataWapper);
Integer count=delegateTask.getVariable("task3OKCount",Integer.class); Integer count=delegateTask.getVariable("task3OKCount",Integer.class);
Integer gose=0;
if (null!=delegateTask.getVariable("task3Count",Integer.class)){
gose=delegateTask.getVariable("task3Count",Integer.class);
}
List<String> userList=delegateTask.getVariable("userList",List.class); List<String> userList=delegateTask.getVariable("userList",List.class);
if(delegateTask.getVariable("actionFlag",Integer.class)==0){ if(delegateTask.getVariable("actionFlag",Integer.class)==0){
@@ -89,40 +93,54 @@ public class MinisterAndDockerSignAfter implements TaskListener {
count++; count++;
delegateTask.setVariable("task3OKCount",count); delegateTask.setVariable("task3OKCount",count);
} }
if(count>=userList.size()){ delegateTask.setVariable("task3Count",gose+1);
if(delegateTask.getVariable("actionFlag",Integer.class)==0){ if (gose+1==userList.size()) {
if(nextUserList != null && !nextUserList.isEmpty()){ if (count >= userList.size()) {
for(String nextUser : nextUserList){ if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busBean.save(busProcessNewNext);
}
} else {
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定");
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(delegateTask.getVariable("directorUser", String.class));
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
}else { } else {
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定"); busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setUserId(delegateTask.getVariable("directorUser", String.class)); busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
}else{ }else {
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class)); busProcessNewNext.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNewNext); busProcessNewNext.setUserId(delegateTask.getVariable("startUser",String.class));
busBean.save(busProcessNewNext);
} }
delegateTask.setVariable("task3Count",0);
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ChooseZrAfter.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class ChooseZrAfter implements TaskListener{
if(object.getString("standInData").equals("INLAND")){ if(object.getString("standInData").equals("INLAND")){
standName = "国内"; standName = "国内";
}else { }else {
standName = "国外"; standName = "海外";
} }
} }
String prcName = standName+"-标准解读流程"; String prcName = standName+"-标准解读流程";
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+1 -1
View File
@@ -98,7 +98,7 @@ public class DeptApplayAfter implements TaskListener{
if(object.getString("standInData").equals("INLAND")){ if(object.getString("standInData").equals("INLAND")){
standName = "国内"; standName = "国内";
}else { }else {
standName = "国外"; standName = "海外";
} }
} }
String prcName = standName+"-标准解读流程"; String prcName = standName+"-标准解读流程";
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class DeptZrAfter implements TaskListener{
if(object.getString("standInData").equals("INLAND")){ if(object.getString("standInData").equals("INLAND")){
standName = "国内"; standName = "国内";
}else { }else {
standName = "国外"; standName = "海外";
} }
} }
String prcName = standName+"-标准解读流程"; String prcName = standName+"-标准解读流程";
src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java
+3 -1
View File
@@ -45,6 +45,8 @@ public class EngineerApplayAfter implements TaskListener{
} }
} else { } else {
delegateTask.setVariable("gcFlag", 2); 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 OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
@@ -57,7 +59,7 @@ public class EngineerApplayAfter implements TaskListener{
if(object.getString("standInData").equals("INLAND")){ if(object.getString("standInData").equals("INLAND")){
standName = "国内"; standName = "国内";
}else { }else {
standName = "国外"; standName = "海外";
} }
} }
String prcName = standName + "-标准解读流程"; String prcName = standName + "-标准解读流程";
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class ExpainAfter implements TaskListener{
if(object.getString("standInData").equals("INLAND")){ if(object.getString("standInData").equals("INLAND")){
standName = "国内"; standName = "国内";
}else { }else {
standName = "国外"; standName = "海外";
} }
} }
String prcName = standName+"-标准解读流程"; String prcName = standName+"-标准解读流程";
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class ResolveAfter implements TaskListener{
if(object.getString("standInData").equals("INLAND")){ if(object.getString("standInData").equals("INLAND")){
standName = "国内"; standName = "国内";
}else { }else {
standName = "国外"; standName = "海外";
} }
} }
String prcName = standName+"-标准解读流程"; String prcName = standName+"-标准解读流程";
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class ZrApplayAfter implements TaskListener{
if(object.getString("standInData").equals("INLAND")){ if(object.getString("standInData").equals("INLAND")){
standName = "国内"; standName = "国内";
}else { }else {
standName = "国外"; standName = "海外";
} }
} }
String prcName = standName+"-标准解读流程"; String prcName = standName+"-标准解读流程";