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

{form:{form:{}}}

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-11-04 17:58:40 +08:00
parent ac879208a4
commit 398ab48120
4 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewAfter.java
+29 -18
View File
@@ -14,10 +14,7 @@ import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.*;
/**
* 工程师审核
@@ -38,8 +35,9 @@ public class EngineerReviewAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
if ("0".equals(object.getString("actionFlag"))){
String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
if ("0".equals( object.getString("actionFlag"))){
JSONObject form = JSONObject.parseObject(object.getString("form"));
String lawsProveEngineer = JSONObject.parseObject(form.getString("form")).getString("lawsProveEngineerId");
if(StringUtils.isNotBlank(lawsProveEngineer)){
delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer);
@@ -59,7 +57,7 @@ public class EngineerReviewAfter implements TaskListener {
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String standName = "";
String prcName = "政策征求意见流程-法规工程师修订";
String prcName = "政策征求意见流程-法规工程师汇总修订";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -72,17 +70,30 @@ public class EngineerReviewAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
/**
* 当子任务结束时存储
*/
Integer commentCount=delegateTask.getVariable("commentCount",Integer.class);
if(commentCount==null)commentCount=0;
commentCount++;
delegateTask.setVariable("count",commentCount);
Collection commentUserList=delegateTask.getVariable("commentUserList",Collection.class);
if(commentCount>=commentUserList.size()){
// 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
}
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java
+2 -2
View File
@@ -38,8 +38,8 @@ public class EngineerRevisionAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
String lawsProveMinister = JSONObject.parseObject(object.getString("form")).getString("lawsProveMinisterId");
JSONObject form = JSONObject.parseObject(object.getString("form"));
String lawsProveMinister = JSONObject.parseObject(form.getString("form")).getString("lawsProveMinisterId");
if(StringUtils.isNotBlank(lawsProveMinister)){
delegateTask.setVariable("lawsProveMinisterId",lawsProveMinister);
src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewAfter.java
+3 -1
View File
@@ -38,7 +38,9 @@ public class MinisterReviewAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
if ("0".equals(object.getString("actionFlag"))){
String lawsProveViceChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveViceChiefId");
JSONObject form = JSONObject.parseObject(object.getString("form"));
String lawsProveViceChief = JSONObject.parseObject(form.getString("form")).getString("lawsProveViceChiefId");
if(StringUtils.isNotBlank(lawsProveViceChief)){
delegateTask.setVariable("lawsProveMinisterVerify",0);
src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorAfter.java
+4 -1
View File
@@ -38,7 +38,10 @@ public class ViceDirectorAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
if ("0".equals(object.getString("actionFlag"))){
String lawsProveChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveChiefId");
JSONObject form = JSONObject.parseObject(object.getString("form"));
String lawsProveChief = JSONObject.parseObject(form.getString("form")).getString("lawsProveChiefId");
if(StringUtils.isNotBlank(lawsProveChief)){
delegateTask.setVariable("lawsProveViceChiefVerify",0);