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
2021-12-28 15:39:17 +08:00
parent 60790f8c1d 2f66177b85
commit 4029f2c243
4 changed files with 79 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java
+22 -15
View File
@@ -37,28 +37,35 @@ public class PCAbzManagerApproveAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object); delegateTask.setVariable("objectJson", object);
//后续节点所需要的数据 //后续节点所需要的数据
List<String> nextUserList=new ArrayList<>(); List<String> nextUserList = new ArrayList<>();
if ("1".equals(object.getString("BZFlag"))){ if ("1".equals(object.getString("BZFlag"))) {
delegateTask.setVariable("BZFlag","1"); delegateTask.setVariable("BZFlag", "1");
delegateTask.setVariable("GCUserId",String.valueOf(delegateTask.getVariable("gcjl"))); delegateTask.setVariable("GCUserId", String.valueOf(delegateTask.getVariable("gcjl")));
nextUserList.add(String.valueOf(delegateTask.getVariable("gcjl"))); nextUserList.add(String.valueOf(delegateTask.getVariable("gcjl")));
}else { } else {
//流程直接结束，抄送消息提示 //流程直接结束，抄送消息提示
delegateTask.setVariable("BZFlag","2"); delegateTask.setVariable("BZFlag", "2");
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
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());
String user = delegateTask.getVariable("prcCreateUser",String.class); String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = delegateTask.getVariable("stId",String.class)+"-合规评估流程-工程经理转办"; String prcName="";
if ("1".equals(object.getString("BZFlag"))) {
prcName= delegateTask.getVariable("stId", String.class) + "-合规评估流程-工程经理转办";
}else {
prcName= delegateTask.getVariable("stId", String.class) + "-合规评估流程-流程结束";
}
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) { if (one1 != null) {
// one1.setOverTime(OVERTIME); if (!"1".equals(object.getString("BZFlag"))) {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("6"); one1.setPrcType("6");
one1.setPrcName(prcName); one1.setPrcName(prcName);
one1.setCreatUser(user); one1.setCreatUser(user);
@@ -67,20 +74,20 @@ public class PCAbzManagerApproveAfter implements TaskListener {
} }
// 存储当前节点意见1 // 存储当前节点意见1
if (null!=object.getString("commentText")) { if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper(); QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3); List<BusProcessNew> list = busBean.list(queryWrapper3);
if(!list.isEmpty()){ if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0); BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText")); busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews); busBean.saveOrUpdate(busProcessNews);
} }
} }
if(nextUserList != null && !nextUserList.isEmpty()){ if (nextUserList != null && !nextUserList.isEmpty()) {
for(String userId : nextUserList){ for (String userId : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8After.java
+4 -2
View File
@@ -14,6 +14,7 @@ import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
//新征求意见流程!!!!! //新征求意见流程!!!!!
@@ -46,7 +47,8 @@ public class Step8After implements TaskListener {
//整备数据 //整备数据
if ("0".equals(object.getString("bdFlag"))) { if ("0".equals(object.getString("bdFlag"))) {
delegateTask.setVariable("bdMark",delegateTask.getVariable("bdMark",Integer.class)); delegateTask.setVariable("bdMark",delegateTask.getVariable("bdMark",Integer.class));
nextUserList.add(delegateTask.getVariable("directorUser",String.class)); List<String> strings=new ArrayList<>(Arrays.asList(delegateTask.getVariable("directorUser",String.class).split(",")));
nextUserList.addAll(strings);
delegateTask.setVariable("hqFlag", "0"); delegateTask.setVariable("hqFlag", "0");
}else { }else {
delegateTask.setVariable("bdMark",delegateTask.getVariable("bdMark",Integer.class)+1); delegateTask.setVariable("bdMark",delegateTask.getVariable("bdMark",Integer.class)+1);
@@ -62,7 +64,7 @@ public class Step8After implements TaskListener {
delegateTask.setVariable("bdFlag","1"); delegateTask.setVariable("bdFlag","1");
} }
} }
delegateTask.setVariable("directorUser",delegateTask.getVariable("directorUser",String.class)); delegateTask.setVariable("directorUserList",nextUserList);
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String user = delegateTask.getVariable("user",String.class); String user = delegateTask.getVariable("user",String.class);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9After.java
+52 -30
View File
@@ -10,6 +10,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.SpringContextUtil;
import io.swagger.models.auth.In;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
@@ -21,7 +22,7 @@ public class Step9After implements TaskListener {
@Override @Override
public void notify(DelegateTask delegateTask) { public void notify(DelegateTask delegateTask) {
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
@@ -30,29 +31,38 @@ public class Step9After implements TaskListener {
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper); Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object); delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
String prcName=""; String prcName = "";
if ("0".equals(object.getString("directorFlag"))){ //设置一个计数器
delegateTask.setVariable("directorFlag","0"); if (null != delegateTask.getVariable("9Counnt", Integer.class)) {
prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-工程研究总院院长批准"; delegateTask.setVariable("9Counnt", delegateTask.getVariable("9Counnt", Integer.class) + 1);
nextUserList.add(object.getString("presidentUser")); } else {
delegateTask.setVariable("presidentUser",object.getString("presidentUser")); delegateTask.setVariable("9Counnt", 1);
}else { }
delegateTask.setVariable("directorFlag","1");
nextUserList.add(delegateTask.getVariable("bzfgIdSum",String.class)); if ("0".equals(object.getString("directorFlag"))) {
prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总"; delegateTask.setVariable("directorFlag", "0");
if (delegateTask.getVariable("9Counnt", Integer.class) == 1) {
delegateTask.setVariable("9Mark", "true");
delegateTask.setVariable("presidentUser", object.getString("presidentUser"));
} else if ("true" == delegateTask.getVariable("7Mark", String.class)) {
delegateTask.setVariable("9Mark", "true");
}
} else {
delegateTask.setVariable("directorFlag", "1");
delegateTask.setVariable("9Mark", "false");
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
String user = delegateTask.getVariable("user",String.class); String user = delegateTask.getVariable("user", String.class);
String username = delegateTask.getVariable("userName",String.class); String username = delegateTask.getVariable("userName", String.class);
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){ if (one1 != null) {
one1.setPrcType("3"); one1.setPrcType("3");
one1.setPrcName(prcName); one1.setPrcName(prcName);
one1.setCreatUser(user); one1.setCreatUser(user);
@@ -73,19 +83,31 @@ public class Step9After implements TaskListener {
busBean.saveOrUpdate(busProcessNews); busBean.saveOrUpdate(busProcessNews);
} }
} }
if (delegateTask.getVariable("9Counnt", Integer.class) >= delegateTask.getVariable("directorUserList",List.class).size()) {
if(nextUserList != null && !nextUserList.isEmpty()){ if ("true".equals(delegateTask.getVariable("9Mark"))){
for(String nextUser : nextUserList){ delegateTask.setVariable("directorFlag", "0");
BusProcessNew busProcessNewNext = new BusProcessNew(); prcName = delegateTask.getVariable("cid") + "-标准征求意见流程-工程研究总院院长批准";
busProcessNewNext.setMsgType("clause"); nextUserList.add(object.getString("presidentUser"));
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); delegateTask.setVariable("presidentUser", object.getString("presidentUser"));
busProcessNewNext.setMesg(object.toJSONString()); }else {
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); delegateTask.setVariable("9Counnt", 0);
busProcessNewNext.setFinishFlag("0"); delegateTask.setVariable("directorFlag", "1");
busProcessNewNext.setTaskInfo(delegateTask.getName()); nextUserList.add(delegateTask.getVariable("bzfgIdSum", String.class));
busProcessNewNext.setUserId(nextUser); prcName = delegateTask.getVariable("cid") + "-标准征求意见流程-标准法规工程师汇总";
busProcessNewNext.setPrcName(prcName); }
busBean.save(busProcessNewNext); 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);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
} }
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java
+1
View File
@@ -105,6 +105,7 @@ public class ResponUserSignAfter implements TaskListener {
res.add(s); res.add(s);
} }
}); });
delegateTask.setVariable("userList",res);
for(String nextUser : res){ for(String nextUser : res){
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");