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-30 14:01:48 +08:00
parent 9af93b357e 29d5dfdaea
commit 8a718ff5b5
12 changed files with 179 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/EsRevisePlanDTO.java
+41
View File
@@ -1,5 +1,6 @@
package com.ydw.bat.wkflow.business_main.datas.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -68,4 +69,44 @@ public class EsRevisePlanDTO {
@ApiModelProperty(value = "起草责任单位")
private String unit;
@ApiModelProperty(value = "起草责任单位ID")
private String unitName;
@ApiModelProperty(value = "引入企业标准json(标准id)")
private String rqbJson;
@ApiModelProperty(value = "引入企业标准json(标准名称)")
private String rqbName;
@ApiModelProperty(value = "引入企业标准json(标准编号)")
private String rqbCode;
@ApiModelProperty(value = "体系结构树（id存储方式是逗号拼接）")
private String tsJson;
@ApiModelProperty(value = "体系结构树（名称逗号拼接展示）")
private String tsJsonName;
@ApiModelProperty(value = "标准范围")
private String area;
@ApiModelProperty(value = "标准范围")
private String areaName;
//企标类别
private String standType;
@ApiModelProperty(value = "企标类别")
private String esMatingRelations;
private String esStandRelations;
@ApiModelProperty(value = "是否引用标准")
@TableField("is_relate")
private String isRelate;
@ApiModelProperty(value = "采用程度")
@TableField("use_level")
private String useLevel;
private String useLevelName;
@ApiModelProperty(value = "简述技术指标依据")
@TableField("technologic")
private String technologic;
@ApiModelProperty(value = "企标类别")
@TableField("buss_sort")
private String bussSort;
}
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java
+1
View File
@@ -32,6 +32,7 @@ public class PCAComplianceAssessmentAfter implements TaskListener {
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
delegateTask.setVariable("GOGOGO","1");
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java
+5 -1
View File
@@ -22,7 +22,11 @@ public class PCAComplianceAssessmentBefore implements TaskListener {
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
if ("GO".equals(delegateTask.getVariable("GOGOGO"))) {
queryWrapper1.eq("TASK_ID", "GO");
}else {
queryWrapper1.isNull("TASK_ID");
}
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbafgManagerApproveAfter.java
+4 -2
View File
@@ -93,7 +93,7 @@ public class PCAbafgManagerApproveAfter implements TaskListener {
busBean.saveOrUpdate(busProcessNews);
}
}
if (Integer.valueOf(delegateTask.getVariable("pass", String.class)) !=
if (null==delegateTask.getVariable("pass")||Integer.valueOf(delegateTask.getVariable("pass", String.class)) !=
delegateTask.getVariable("workPeoples", List.class).size()) {
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String userId : nextUserList) {
@@ -103,7 +103,9 @@ public class PCAbafgManagerApproveAfter implements TaskListener {
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskId("996");
if (null!=delegateTask.getVariable("pass")) {
busProcessNewNext.setTaskId("996");
}
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(userId);
busProcessNewNext.setPrcName(prcName);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java
+22 -1
View File
@@ -21,6 +21,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.poi.util.LocaleID;
import org.springframework.beans.BeanUtils;
import java.text.SimpleDateFormat;
@@ -151,7 +152,12 @@ public class PCAffLiableDistributeAfter implements TaskListener {
nextUserList.add(s);
}
});
delegateTask.setVariable("workPeoples", nextUserList);
if (null!=delegateTask.getVariable("DisPeo")){
delegateTask.getVariable("DisPeo",List.class).addAll(nextUserList);
}else {
delegateTask.setVariable("DisPeo",nextUserList);
}
delegateTask.setVariable("workPeoples", delegateTask.getVariable("DisPeo",List.class));
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("prcCreateUser", String.class);
@@ -169,6 +175,20 @@ public class PCAffLiableDistributeAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见1
if (null!=object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if(!list.isEmpty()){
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
delegateTask.setVariable("GOGOGO","GO");
// 存储当前节点意见
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String userId : nextUserList) {
@@ -179,6 +199,7 @@ public class PCAffLiableDistributeAfter implements TaskListener {
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setTaskId("GO");
busProcessNewNext.setUserId(userId);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultAfter.java
-14
View File
@@ -80,21 +80,7 @@ public class UploadResearchResultAfter 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());
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java
+50 -11
View File
@@ -16,9 +16,7 @@ import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
public class ProcessStep4After implements TaskListener {
@@ -47,19 +45,48 @@ public class ProcessStep4After implements TaskListener {
if ("0".equals(object.getString("bzfgbzFlag"))){
prcName = "企标制修订计划-流程结束";
delegateTask.setVariable("bzfgbzFlag",0);
// 建立对应字符串
Map<String,String> plan_status=new HashMap<>();
plan_status.put("未开始","0");
plan_status.put("制定中","1");
plan_status.put("修订中","2");
plan_status.put("已取消","3");
plan_status.put("已完成","4");
Map<String,String> revise_status=new HashMap<>();
revise_status.put("制定","1");
revise_status.put("修订","2");
//1合并 2延期 3取消 4更名 5立项
if ("1".equals(object.getString("type"))){
lawsUserInfoService.delPlan(object.getString("esId1")+","+object.getString("esId2"));
EsRevisePlanDTO del1=new EsRevisePlanDTO();
del1.setId(object.getString("esId1"));
del1.setPlanStatus("3");
lawsUserInfoService.modPlan(del1);
EsRevisePlanDTO del2=new EsRevisePlanDTO();
del2.setId(object.getString("esId2"));
del2.setPlanStatus("3");
lawsUserInfoService.modPlan(del2);
EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO();
esRevisePlanDTO.setEsName(object.getString("esName"));
esRevisePlanDTO.setUnit(object.getString("unitId"));
esRevisePlanDTO.setUnit(object.getString("unit"));
esRevisePlanDTO.setDrafter(object.getString("drafter"));
esRevisePlanDTO.setResPerson(object.getString("resPerson"));
esRevisePlanDTO.setPlanStatus(object.getString("planStatus"));
esRevisePlanDTO.setReviseStatus(object.getString("reviseStatus"));
esRevisePlanDTO.setPlanStatus(plan_status.get(object.getString("planStatus")));
esRevisePlanDTO.setReviseStatus(revise_status.get(object.getString("reviseStatus")));
esRevisePlanDTO.setWgLeader(object.getString("wgLeader"));
esRevisePlanDTO.setDraftTime(object.getDate("draftTime"));
esRevisePlanDTO.setReleaseTime(object.getDate("releaseTime"));
esRevisePlanDTO.setEsMatingRelations(object.getString("esMatingRelations"));
esRevisePlanDTO.setEsStandRelations(object.getString("esStandRelations"));
esRevisePlanDTO.setUseLevel(object.getString("useLevel"));
esRevisePlanDTO.setIsRelate(object.getString("isRelate"));
esRevisePlanDTO.setTsJson(object.getString("tsJson"));
esRevisePlanDTO.setArea(object.getString("area"));
esRevisePlanDTO.setRqbJson(object.getString("rqbJson"));
esRevisePlanDTO.setTechnologic(object.getString("technologic"));
esRevisePlanDTO.setBussSort(object.getString("bussSort"));
lawsUserInfoService.addPlan(esRevisePlanDTO);
}else if ("2".equals(object.getString("type"))){
EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO();
@@ -68,7 +95,10 @@ public class ProcessStep4After implements TaskListener {
esRevisePlanDTO.setDraftTime(object.getDate("yqDraftTime"));
lawsUserInfoService.modPlan(esRevisePlanDTO);
}else if ("3".equals(object.getString("type"))){
lawsUserInfoService.delPlan(object.getString("esId"));
EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO();
esRevisePlanDTO.setId(object.getString("esId"));
esRevisePlanDTO.setPlanStatus("3");
lawsUserInfoService.modPlan(esRevisePlanDTO);
}else if ("4".equals(object.getString("type"))){
EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO();
esRevisePlanDTO.setEsName(object.getString("renameEs"));
@@ -78,14 +108,23 @@ public class ProcessStep4After implements TaskListener {
//立项
EsRevisePlanDTO esRevisePlanDTO=new EsRevisePlanDTO();
esRevisePlanDTO.setEsName(object.getString("esName"));
esRevisePlanDTO.setUnit(object.getString("unitId"));
esRevisePlanDTO.setUnit(object.getString("unit"));
esRevisePlanDTO.setDrafter(object.getString("drafter"));
esRevisePlanDTO.setResPerson(object.getString("resPerson"));
esRevisePlanDTO.setPlanStatus(object.getString("planStatus"));
esRevisePlanDTO.setReviseStatus(object.getString("reviseStatus"));
esRevisePlanDTO.setPlanStatus(plan_status.get(object.getString("planStatus")));
esRevisePlanDTO.setReviseStatus(revise_status.get(object.getString("reviseStatus")));
esRevisePlanDTO.setWgLeader(object.getString("wgLeader"));
esRevisePlanDTO.setDraftTime(object.getDate("draftTime"));
esRevisePlanDTO.setReleaseTime(object.getDate("releaseTime"));
esRevisePlanDTO.setEsMatingRelations(object.getString("esMatingRelations"));
esRevisePlanDTO.setEsStandRelations(object.getString("esStandRelations"));
esRevisePlanDTO.setUseLevel(object.getString("useLevel"));
esRevisePlanDTO.setIsRelate(object.getString("isRelate"));
esRevisePlanDTO.setTsJson(object.getString("tsJson"));
esRevisePlanDTO.setArea(object.getString("area"));
esRevisePlanDTO.setRqbJson(object.getString("rqbJson"));
esRevisePlanDTO.setTechnologic(object.getString("technologic"));
esRevisePlanDTO.setBussSort(object.getString("bussSort"));
lawsUserInfoService.addPlan(esRevisePlanDTO);
}
}else {
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+27 -14
View File
@@ -100,19 +100,21 @@ public class DeptApplayAfter implements TaskListener{
});
JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class));
jsonArray1.forEach(obj ->{
JSONObject object1 = JSONObject.parseObject(obj.toString());
SarStandItems sarStandItems1=new SarStandItems();
sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly",String.class));
sarStandItems1.setStandId(object.getString("standId"));
sarStandItems1.setItemsNum(object1.getString("itemsNum"));
sarStandItems1.setItemsName(object1.getString("itemsName"));
sarStandItems1.setResponsibleUnit(object1.getString("responsibleUnitShow"));
sarStandItems1.setDutyEngineer(object1.getString("zxUserIdName"));
sarStandItems1.setTermsConditions(object1.getString("itermsConditions"));
sarStandItems1.setReadContent(object1.getString("technicalRequir"));
sarStandItems.add(sarStandItems1);
});
if (null!=jsonArray1 && jsonArray1.size()>0) {
jsonArray1.forEach(obj -> {
JSONObject object1 = JSONObject.parseObject(obj.toString());
SarStandItems sarStandItems1 = new SarStandItems();
sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly", String.class));
sarStandItems1.setStandId(object.getString("standId"));
sarStandItems1.setItemsNum(object1.getString("itemsNum"));
sarStandItems1.setItemsName(object1.getString("itemsName"));
sarStandItems1.setResponsibleUnit(object1.getString("responsibleUnitShow"));
sarStandItems1.setDutyEngineer(object1.getString("zxUserIdName"));
sarStandItems1.setTermsConditions(object1.getString("itermsConditions"));
sarStandItems1.setReadContent(object1.getString("technicalRequir"));
sarStandItems.add(sarStandItems1);
});
}
//标准状态修改
SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO();
sarFileSplitInfoEO.setSplitStatus("4");
@@ -122,10 +124,19 @@ public class DeptApplayAfter implements TaskListener{
lawsUserInfoService.sarStandItemsSaveBatch(sarStandItems);
lawsUserInfoService.SarInterpretationNationalStandardSaveBatch(standards);
prcName=prcName+"-流程结束";
if (null==delegateTask.getVariable("lastCount")){
delegateTask.setVariable("lastCount",1);
}else {
delegateTask.setVariable("lastCount",delegateTask.getVariable("lastCount",Integer.class)+1);
}
} else {
delegateTask.setVariable("bzFlag", 2);
prcName=prcName+"-填写解读分析";
}
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("applyUserId");
@@ -135,7 +146,9 @@ public class DeptApplayAfter implements TaskListener{
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setOverTime(OVERTIME);
if (delegateTask.getVariable("lastCount",Integer.class)>=delegateTask.getVariable("zxUserList",List.class).size()) {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("9");
one1.setPrcName(prcName);
one1.setCreatUser(user);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java
+2 -1
View File
@@ -50,6 +50,7 @@ public class DeptZrAfter implements TaskListener{
JSONObject jsonObject = new JSONObject();
jsonObject.put("id",str);
jsonObject.put("applyUserId",delegateTask.getAssignee());
jsonObject.put("KEYS",str+delegateTask.getAssignee());
responUserList.add(jsonObject);
}
delegateTask.setVariable("zxUserList",responUserList);
@@ -73,7 +74,6 @@ public class DeptZrAfter implements TaskListener{
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("9");
one1.setPrcName(prcName);
one1.setCreatUser(user);
@@ -99,6 +99,7 @@ public class DeptZrAfter implements TaskListener{
for(String nextUser : nextUserList){ //2次
List<JSONArrayVo> listRes = userGroupMap.get(nextUser);
object.put("itemList", JSON.toJSONString(listRes));
object.put("AOLIGEI",nextUser+delegateTask.getAssignee());
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java
+12 -10
View File
@@ -81,16 +81,18 @@ public class ExpainAfter implements TaskListener{
if(responUserList != null){
for (Object obj:responUserList) {
JSONObject object1 = (JSONObject)obj;
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.setPrcName(prcName);
busProcessNewNext.setUserId(object1.getString("applyUserId"));
busBean.save(busProcessNewNext);
if (object.getString("AOLIGEI").equals(object1.getString("KEYS"))) {
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.setPrcName(prcName);
busProcessNewNext.setUserId(object1.getString("applyUserId"));
busBean.save(busProcessNewNext);
}
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+12 -15
View File
@@ -79,7 +79,6 @@ public class ResolveAfter implements TaskListener{
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
// one1.setOverTime(OVERTIME);
one1.setPrcType("9");
one1.setPrcName(prcName);
one1.setCreatUser(user);
@@ -87,25 +86,23 @@ public class ResolveAfter 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);
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){ //2次
// List<JSONArrayVo> listRes = userGroupMap.get(nextUser);
// object.put("itemList", JSON.toJSONString(listRes));
List<JSONArrayVo> listRes = userGroupMap.get(nextUser);
object.put("itemList", JSON.toJSONString(listRes));
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
//busProcessNewNext.setMesg(StringEscapeUtils.unescapeJavaScript(object.toJSONString()));//返转义函数
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
+3
View File
@@ -9,6 +9,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.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import lombok.extern.slf4j.Slf4j;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
@@ -21,6 +22,7 @@ import java.util.List;
/**
* 责任人审核发起后
*/
@Slf4j
public class ZrApplayAfter implements TaskListener{
@Override
public void notify(DelegateTask delegateTask) {
@@ -58,6 +60,7 @@ public class ZrApplayAfter implements TaskListener{
}else {
prcName=prcName+"-填写解读分析";
delegateTask.setVariable("zrFlag",2);
log.error("戒毒流程当前工作节点驳回人为："+String.valueOf(delegateTask.getVariable("zxUserId")));
JSONObject object1=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("zxUserId")));
nextUserList.add(String.valueOf(object1.getString("id")));
}