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

fix: 政策征求意见的修改 管理员后的节点驳回后到管理员节点

Browse Source
This commit is contained in:
wxyclub
2024-02-04 17:26:47 +08:00
parent 5025679ead
commit c164653767
5 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess11After.java
+7
View File
@@ -7,6 +7,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
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.business_main.datas.service.IPolicySolicitOpinionEOService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import com.ydw.bat.wkflow.util.enums.ApprovalFlagEnum;
import org.activiti.engine.delegate.DelegateTask;
@@ -23,6 +24,7 @@ public class PolicySolicitOpinionProcess11After implements TaskListener {
public void notify(DelegateTask delegateTask) {
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
IPolicySolicitOpinionEOService policySolicitOpinionEOService = SpringContextUtil.getBean(IPolicySolicitOpinionEOService.class);
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -49,6 +51,11 @@ public class PolicySolicitOpinionProcess11After implements TaskListener {
}
busBean.saveBatch(addBusProcessNewList);
// 保存管理员填写的征求意见信息
object.put("currentUserId",delegateTask.getAssignee());
object.put("prcId",delegateTask.getProcessInstanceId());
policySolicitOpinionEOService.batchInsert(object);
// 配置多实例
delegateTask.setVariable("shr2UserIdList", nextUserList);
delegateTask.setVariable("shr2UserCount", nextUserList.size());
src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess12After.java
+3 -3
View File
@@ -81,7 +81,7 @@ public class PolicySolicitOpinionProcess12After implements TaskListener {
}
}
} else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) {
String pzr1UserId = jsonForm.getString("pzr1UserId");
String glyUserId = jsonForm.getString("glyUserId");
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -89,10 +89,10 @@ public class PolicySolicitOpinionProcess12After implements TaskListener {
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(pzr1UserId);
busProcessNewNext.setUserId(glyUserId);
busBean.save(busProcessNewNext);
delegateTask.setVariable("pzr1UserId", pzr1UserId);
delegateTask.setVariable("djrUserId", glyUserId);
delegateTask.setVariable("hqrUserIdList", new ArrayList<String>());
delegateTask.setVariable("shr2UserOverruleCount", 1);
}
src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess13After.java
+3 -3
View File
@@ -67,7 +67,7 @@ public class PolicySolicitOpinionProcess13After implements TaskListener {
}
}
} else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) {
String pzr1UserId = jsonForm.getString("pzr1UserId");
String glyUserId = jsonForm.getString("glyUserId");
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -75,10 +75,10 @@ public class PolicySolicitOpinionProcess13After implements TaskListener {
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(pzr1UserId);
busProcessNewNext.setUserId(glyUserId);
busBean.save(busProcessNewNext);
delegateTask.setVariable("pzr1UserId", pzr1UserId);
delegateTask.setVariable("glyUserId", glyUserId);
delegateTask.setVariable("hqrUserOverruleCount", 1);
}
src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess14After.java
+6 -3
View File
@@ -14,6 +14,9 @@ import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
/**
* 审定后
*/
public class PolicySolicitOpinionProcess14After implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
@@ -51,7 +54,7 @@ public class PolicySolicitOpinionProcess14After implements TaskListener {
delegateTask.setVariable("pzr2UserId", pzr2UserId);
}
} else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) {
String pzr1UserId = jsonForm.getString("pzr1UserId");
String glyUserId = jsonForm.getString("glyUserId");
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -59,10 +62,10 @@ public class PolicySolicitOpinionProcess14After implements TaskListener {
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(pzr1UserId);
busProcessNewNext.setUserId(glyUserId);
busBean.save(busProcessNewNext);
delegateTask.setVariable("pzr1UserId", pzr1UserId);
delegateTask.setVariable("glyUserId", glyUserId);
delegateTask.setVariable("sdr2UserOverruleCount", 1);
}
src/main/java/com/ydw/bat/wkflow/listener/policySolicitOpinionProcess/PolicySolicitOpinionProcess15After.java
+6 -3
View File
@@ -18,6 +18,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* 批准后
*/
public class PolicySolicitOpinionProcess15After implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
@@ -53,7 +56,7 @@ public class PolicySolicitOpinionProcess15After implements TaskListener {
delegateTask.setVariable("csrUserIdList", nextUserList);
}
} else if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.OVERRULE.getValue())) {
String pzr1UserId = jsonForm.getString("pzr1UserId");
String glyUserId = jsonForm.getString("glyUserId");
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -61,10 +64,10 @@ public class PolicySolicitOpinionProcess15After implements TaskListener {
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(pzr1UserId);
busProcessNewNext.setUserId(glyUserId);
busBean.save(busProcessNewNext);
delegateTask.setVariable("pzr1UserId", pzr1UserId);
delegateTask.setVariable("glyUserId", glyUserId);
}
// 存储当前节点意见