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

fix: 重点认证标准/政策合规性项目审查流程BUG修改

Browse Source
This commit is contained in:
wxyclub
2024-07-01 13:34:34 +08:00
parent 508e966fad
commit 0929339284
21 changed files with 279 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess10After.java
+29 -12
View File
@@ -1,6 +1,7 @@
package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -10,8 +11,11 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
import com.ydw.bat.wkflow.util.enums.ApprovalFlagEnum; import com.ydw.bat.wkflow.util.enums.ApprovalFlagEnum;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import java.util.List;
public class PolicyComplianceProgramReviewProcess10After implements TaskListener { public class PolicyComplianceProgramReviewProcess10After implements TaskListener {
@Override @Override
public void notify(DelegateTask delegateTask) { public void notify(DelegateTask delegateTask) {
@@ -24,6 +28,8 @@ public class PolicyComplianceProgramReviewProcess10After implements TaskListener
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject jsonForm = object.getJSONObject("form"); JSONObject jsonForm = object.getJSONObject("form");
String prcName = "重点认证标准/政策合规性项目审查流程";
String approvalFlag = jsonForm.getString("approvalFlag"); String approvalFlag = jsonForm.getString("approvalFlag");
if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) {
// 责任部门 子流程总数 // 责任部门 子流程总数
@@ -44,7 +50,8 @@ public class PolicyComplianceProgramReviewProcess10After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("管理员");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(glyUserId); busProcessNewNext.setUserId(glyUserId);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
@@ -56,22 +63,32 @@ public class PolicyComplianceProgramReviewProcess10After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("责任对接人汇总");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(djrUserId); busProcessNewNext.setUserId(djrUserId);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
busProcessNew.setMsgType("clause"); queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
busProcessNew.setPId(delegateTask.getProcessInstanceId()); List<BusProcessNew> list = busBean.list(queryWrapper1);
busProcessNew.setMesg(object.toJSONString()); if (CollectionUtils.isNotEmpty(list)) {
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); BusProcessNew busProcessNew = list.get(0);
busProcessNew.setTaskId(delegateTask.getId()); busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText")); busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0"); busBean.saveOrUpdate(busProcessNew);
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);
delegateTask.setVariable("approvalFlag",approvalFlag); delegateTask.setVariable("approvalFlag",approvalFlag);
} }
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess10Before.java
+1 -1
View File
@@ -19,7 +19,7 @@ public class PolicyComplianceProgramReviewProcess10Before implements TaskListene
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper = new QueryWrapper<>();
queryWrapper.isNull("TASK_ID"); queryWrapper.isNull("TASK_ID");
queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper.eq("USER_ID",delegateTask.getAssignee()); queryWrapper.eq("USER_ID",delegateTask.getAssignee());
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11After.java
+26 -12
View File
@@ -1,6 +1,7 @@
package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -32,6 +33,8 @@ public class PolicyComplianceProgramReviewProcess11After implements TaskListener
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject jsonForm = object.getJSONObject("form"); JSONObject jsonForm = object.getJSONObject("form");
String prcName = "重点认证标准/政策合规性项目审查流程";
String approvalFlag = jsonForm.getString("approvalFlag"); String approvalFlag = jsonForm.getString("approvalFlag");
if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) {
String shr2UserIds = jsonForm.getString("shr2UserIds"); String shr2UserIds = jsonForm.getString("shr2UserIds");
@@ -45,7 +48,8 @@ public class PolicyComplianceProgramReviewProcess11After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("审核");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);
addBusProcessNewList.add(busProcessNewNext); addBusProcessNewList.add(busProcessNewNext);
} }
@@ -65,7 +69,8 @@ public class PolicyComplianceProgramReviewProcess11After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("批准");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(pzr1UserId); busProcessNewNext.setUserId(pzr1UserId);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
@@ -73,16 +78,25 @@ public class PolicyComplianceProgramReviewProcess11After implements TaskListener
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
busProcessNew.setMsgType("clause"); queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
busProcessNew.setPId(delegateTask.getProcessInstanceId()); List<BusProcessNew> list = busBean.list(queryWrapper1);
busProcessNew.setMesg(object.toJSONString()); if (CollectionUtils.isNotEmpty(list)) {
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); BusProcessNew busProcessNew = list.get(0);
busProcessNew.setTaskId(delegateTask.getId()); busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText")); busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0"); busBean.saveOrUpdate(busProcessNew);
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);
delegateTask.setVariable("approvalFlag", approvalFlag); delegateTask.setVariable("approvalFlag", approvalFlag);
} }
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess11Before.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess11Before implements TaskListene
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper = new QueryWrapper<>();
queryWrapper.isNull("TASK_ID"); queryWrapper.isNull("TASK_ID");
queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper.eq("USER_ID",delegateTask.getAssignee()); queryWrapper.eq("USER_ID",delegateTask.getAssignee());
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12After.java
+26 -12
View File
@@ -1,6 +1,7 @@
package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_activiti.service.TaskTodoService; import com.ydw.bat.wkflow.business_activiti.service.TaskTodoService;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -37,6 +38,8 @@ public class PolicyComplianceProgramReviewProcess12After implements TaskListener
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject jsonForm = object.getJSONObject("form"); JSONObject jsonForm = object.getJSONObject("form");
String prcName = "重点认证标准/政策合规性项目审查流程";
String approvalFlag = jsonForm.getString("approvalFlag"); String approvalFlag = jsonForm.getString("approvalFlag");
if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) {
int shr2UserPassCount = (int) delegateTask.getVariable("shr2UserPassCount"); int shr2UserPassCount = (int) delegateTask.getVariable("shr2UserPassCount");
@@ -61,7 +64,8 @@ public class PolicyComplianceProgramReviewProcess12After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("审定");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);
addBusProcessNewList.add(busProcessNewNext); addBusProcessNewList.add(busProcessNewNext);
} }
@@ -81,7 +85,8 @@ public class PolicyComplianceProgramReviewProcess12After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("管理员");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(glyUserId); busProcessNewNext.setUserId(glyUserId);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
@@ -95,16 +100,25 @@ public class PolicyComplianceProgramReviewProcess12After implements TaskListener
// policySolicitOpinionEOService.batchInsert(object); // policySolicitOpinionEOService.batchInsert(object);
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
busProcessNew.setMsgType("clause"); queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
busProcessNew.setPId(delegateTask.getProcessInstanceId()); List<BusProcessNew> list = busBean.list(queryWrapper1);
busProcessNew.setMesg(object.toJSONString()); if (CollectionUtils.isNotEmpty(list)) {
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); BusProcessNew busProcessNew = list.get(0);
busProcessNew.setTaskId(delegateTask.getId()); busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText")); busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0"); busBean.saveOrUpdate(busProcessNew);
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);
delegateTask.setVariable("approvalFlag", approvalFlag); delegateTask.setVariable("approvalFlag", approvalFlag);
} }
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess12Before.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess12Before implements TaskListene
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper = new QueryWrapper<>();
queryWrapper.isNull("TASK_ID"); queryWrapper.isNull("TASK_ID");
queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper.eq("USER_ID",delegateTask.getAssignee()); queryWrapper.eq("USER_ID",delegateTask.getAssignee());
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13Before.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess13Before implements TaskListene
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper = new QueryWrapper<>();
queryWrapper.isNull("TASK_ID"); queryWrapper.isNull("TASK_ID");
queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper.eq("USER_ID",delegateTask.getAssignee()); queryWrapper.eq("USER_ID",delegateTask.getAssignee());
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess1After.java
+25 -12
View File
@@ -1,6 +1,7 @@
package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
@@ -46,7 +47,7 @@ public class PolicyComplianceProgramReviewProcess1After implements TaskListener
String username = object.getString("prcCreateUserName"); String username = object.getString("prcCreateUserName");
String prcName = "重点认证标准/政策合规性项目审查流程"; String prcName = "重点认证标准/政策合规性项目审查流程";
QueryWrapper bpnQueryWrap = new QueryWrapper(); QueryWrapper<BusProcessName> bpnQueryWrap = new QueryWrapper<>();
bpnQueryWrap.eq("PRC_ID", delegateTask.getProcessInstanceId()); bpnQueryWrap.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName bpn = busProcessNameService.getOne(bpnQueryWrap); BusProcessName bpn = busProcessNameService.getOne(bpnQueryWrap);
if (bpn != null) { if (bpn != null) {
@@ -61,16 +62,27 @@ public class PolicyComplianceProgramReviewProcess1After implements TaskListener
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
busProcessNew.setMsgType("clause"); queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
busProcessNew.setPId(delegateTask.getProcessInstanceId()); List<BusProcessNew> list = busBean.list(queryWrapper1);
busProcessNew.setMesg(object.toJSONString()); if (CollectionUtils.isNotEmpty(list)) {
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); BusProcessNew busProcessNew = list.get(0);
busProcessNew.setTaskId(delegateTask.getId()); busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText")); busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0"); busBean.saveOrUpdate(busProcessNew);
busProcessNew.setTaskInfo(delegateTask.getName()); } else {
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());
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
}
// 如果是从标准跟踪清单下发的流程 需要修改主服务表中的流程状态，修改为 进行中 // 如果是从标准跟踪清单下发的流程 需要修改主服务表中的流程状态，修改为 进行中
String checklistId = jsonForm.getString("checklistId"); String checklistId = jsonForm.getString("checklistId");
@@ -88,7 +100,8 @@ public class PolicyComplianceProgramReviewProcess1After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("审核");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);
addBusProcessNewList.add(busProcessNewNext); addBusProcessNewList.add(busProcessNewNext);
} }
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess1Before.java
+1 -1
View File
@@ -17,7 +17,7 @@ public class PolicyComplianceProgramReviewProcess1Before implements TaskListener
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.isNull("TASK_ID"); queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1); List<BusProcessNew> list = busBean.list(queryWrapper1);
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess2After.java
+25 -12
View File
@@ -1,6 +1,7 @@
package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_activiti.service.TaskTodoService; import com.ydw.bat.wkflow.business_activiti.service.TaskTodoService;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -32,6 +33,7 @@ public class PolicyComplianceProgramReviewProcess2After implements TaskListener
JSONObject jsonForm = object.getJSONObject("form"); JSONObject jsonForm = object.getJSONObject("form");
String prcName = "重点认证标准/政策合规性项目审查流程";
String approvalFlag = jsonForm.getString("approvalFlag"); String approvalFlag = jsonForm.getString("approvalFlag");
if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) {
int shr1UserPassCount = (int) delegateTask.getVariable("shr1UserPassCount"); int shr1UserPassCount = (int) delegateTask.getVariable("shr1UserPassCount");
@@ -55,7 +57,8 @@ public class PolicyComplianceProgramReviewProcess2After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("审定");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);
addBusProcessNewList.add(busProcessNewNext); addBusProcessNewList.add(busProcessNewNext);
} }
@@ -75,22 +78,32 @@ public class PolicyComplianceProgramReviewProcess2After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("起草修改");
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
delegateTask.setVariable("shr1UserOverruleCount", 1); delegateTask.setVariable("shr1UserOverruleCount", 1);
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
busProcessNew.setMsgType("clause"); queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
busProcessNew.setPId(delegateTask.getProcessInstanceId()); List<BusProcessNew> list = busBean.list(queryWrapper1);
busProcessNew.setMesg(object.toJSONString()); if (CollectionUtils.isNotEmpty(list)) {
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); BusProcessNew busProcessNew = list.get(0);
busProcessNew.setTaskId(delegateTask.getId()); busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText")); busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0"); busBean.saveOrUpdate(busProcessNew);
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);
delegateTask.setVariable("approvalFlag",approvalFlag); delegateTask.setVariable("approvalFlag",approvalFlag);
} }
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess2Before.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess2Before implements TaskListener
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper = new QueryWrapper<>();
queryWrapper.isNull("TASK_ID"); queryWrapper.isNull("TASK_ID");
queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper.eq("USER_ID",delegateTask.getAssignee()); queryWrapper.eq("USER_ID",delegateTask.getAssignee());
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess4After.java
+28 -12
View File
@@ -1,6 +1,7 @@
package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_activiti.service.TaskTodoService; import com.ydw.bat.wkflow.business_activiti.service.TaskTodoService;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -11,8 +12,11 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
import com.ydw.bat.wkflow.util.enums.ApprovalFlagEnum; import com.ydw.bat.wkflow.util.enums.ApprovalFlagEnum;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import java.util.List;
public class PolicyComplianceProgramReviewProcess4After implements TaskListener { public class PolicyComplianceProgramReviewProcess4After implements TaskListener {
@Override @Override
public void notify(DelegateTask delegateTask) { public void notify(DelegateTask delegateTask) {
@@ -27,6 +31,7 @@ public class PolicyComplianceProgramReviewProcess4After implements TaskListener
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject jsonForm = object.getJSONObject("form"); JSONObject jsonForm = object.getJSONObject("form");
String prcName = "重点认证标准/政策合规性项目审查流程";
String approvalFlag = jsonForm.getString("approvalFlag"); String approvalFlag = jsonForm.getString("approvalFlag");
if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) {
int sdr1UserPassCount = (int) delegateTask.getVariable("sdr1UserPassCount"); int sdr1UserPassCount = (int) delegateTask.getVariable("sdr1UserPassCount");
@@ -45,7 +50,8 @@ public class PolicyComplianceProgramReviewProcess4After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("批准");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(pzr1UserId); busProcessNewNext.setUserId(pzr1UserId);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
@@ -58,23 +64,33 @@ public class PolicyComplianceProgramReviewProcess4After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("起草修改");
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
delegateTask.setVariable("sdr1UserOverruleCount", 1); delegateTask.setVariable("sdr1UserOverruleCount", 1);
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
busProcessNew.setMsgType("clause"); queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
busProcessNew.setPId(delegateTask.getProcessInstanceId()); List<BusProcessNew> list = busBean.list(queryWrapper1);
busProcessNew.setMesg(object.toJSONString()); if (CollectionUtils.isNotEmpty(list)) {
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); BusProcessNew busProcessNew = list.get(0);
busProcessNew.setTaskId(delegateTask.getId()); busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText")); busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0"); busBean.saveOrUpdate(busProcessNew);
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);
delegateTask.setVariable("approvalFlag",approvalFlag); delegateTask.setVariable("approvalFlag",approvalFlag);
} }
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess4Before.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess4Before implements TaskListener
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper = new QueryWrapper<>();
queryWrapper.isNull("TASK_ID"); queryWrapper.isNull("TASK_ID");
queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper.eq("USER_ID",delegateTask.getAssignee()); queryWrapper.eq("USER_ID",delegateTask.getAssignee());
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess5After.java
+27 -13
View File
@@ -1,6 +1,7 @@
package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess; package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -30,6 +31,7 @@ public class PolicyComplianceProgramReviewProcess5After implements TaskListener
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject jsonForm = object.getJSONObject("form"); JSONObject jsonForm = object.getJSONObject("form");
String prcName = "重点认证标准/政策合规性项目审查流程";
String approvalFlag = jsonForm.getString("approvalFlag"); String approvalFlag = jsonForm.getString("approvalFlag");
if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) { if (StringUtils.equals(approvalFlag, ApprovalFlagEnum.PASS.getValue())) {
Date approvalUnitDeadline = jsonForm.getDate("approvalUnitDeadline"); Date approvalUnitDeadline = jsonForm.getDate("approvalUnitDeadline");
@@ -45,7 +47,8 @@ public class PolicyComplianceProgramReviewProcess5After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("管理员");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(glyUserId); busProcessNewNext.setUserId(glyUserId);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
@@ -65,7 +68,8 @@ public class PolicyComplianceProgramReviewProcess5After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("责任对接人分配任务");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);
addBusProcessNewList.add(busProcessNewNext); addBusProcessNewList.add(busProcessNewNext);
} }
@@ -86,21 +90,31 @@ public class PolicyComplianceProgramReviewProcess5After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("起草修改");
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
busProcessNew.setMsgType("clause"); queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
busProcessNew.setPId(delegateTask.getProcessInstanceId()); List<BusProcessNew> list = busBean.list(queryWrapper1);
busProcessNew.setMesg(object.toJSONString()); if (CollectionUtils.isNotEmpty(list)) {
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); BusProcessNew busProcessNew = list.get(0);
busProcessNew.setTaskId(delegateTask.getId()); busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText")); busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0"); busBean.saveOrUpdate(busProcessNew);
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);
delegateTask.setVariable("approvalFlag",approvalFlag); delegateTask.setVariable("approvalFlag",approvalFlag);
} }
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess5Before.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess5Before implements TaskListener
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper = new QueryWrapper<>();
queryWrapper.isNull("TASK_ID"); queryWrapper.isNull("TASK_ID");
queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper.eq("USER_ID",delegateTask.getAssignee()); queryWrapper.eq("USER_ID",delegateTask.getAssignee());
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess7After.java
+26 -12
View File
@@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -34,6 +35,8 @@ public class PolicyComplianceProgramReviewProcess7After implements TaskListener
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject jsonForm = object.getJSONObject("form"); JSONObject jsonForm = object.getJSONObject("form");
String prcName = "重点认证标准/政策合规性项目审查流程";
// 提交方式，如果该字段不为空，则是定时器自动提交 定时器自动提交value:timerAutoSubmit // 提交方式，如果该字段不为空，则是定时器自动提交 定时器自动提交value:timerAutoSubmit
String submitMethod = object.getString("submitMethod"); String submitMethod = object.getString("submitMethod");
if (StringUtils.isEmpty(submitMethod)) { if (StringUtils.isEmpty(submitMethod)) {
@@ -72,7 +75,8 @@ public class PolicyComplianceProgramReviewProcess7After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("责任人任务处理");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);
addBusProcessNewList.add(busProcessNewNext); addBusProcessNewList.add(busProcessNewNext);
@@ -112,7 +116,8 @@ public class PolicyComplianceProgramReviewProcess7After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("管理员");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(glyUserId); busProcessNewNext.setUserId(glyUserId);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
@@ -121,16 +126,25 @@ public class PolicyComplianceProgramReviewProcess7After implements TaskListener
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
busProcessNew.setMsgType("clause"); queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
busProcessNew.setPId(delegateTask.getProcessInstanceId()); List<BusProcessNew> list = busBean.list(queryWrapper1);
busProcessNew.setMesg(object.toJSONString()); if (CollectionUtils.isNotEmpty(list)) {
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); BusProcessNew busProcessNew = list.get(0);
busProcessNew.setTaskId(delegateTask.getId()); busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText")); busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0"); busBean.saveOrUpdate(busProcessNew);
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);
delegateTask.setVariable("submitMethod",submitMethod); delegateTask.setVariable("submitMethod",submitMethod);
} }
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess7Before.java
+1 -1
View File
@@ -19,7 +19,7 @@ public class PolicyComplianceProgramReviewProcess7Before implements TaskListener
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper = new QueryWrapper<>();
queryWrapper.isNull("TASK_ID"); queryWrapper.isNull("TASK_ID");
queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper.eq("USER_ID",delegateTask.getAssignee()); queryWrapper.eq("USER_ID",delegateTask.getAssignee());
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess8After.java
+27 -12
View File
@@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_activiti.service.TaskTodoService; import com.ydw.bat.wkflow.business_activiti.service.TaskTodoService;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
@@ -11,6 +12,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.*;
import com.ydw.bat.wkflow.util.SpringContextUtil; import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
@@ -31,6 +33,8 @@ public class PolicyComplianceProgramReviewProcess8After implements TaskListener
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject jsonForm = object.getJSONObject("form"); JSONObject jsonForm = object.getJSONObject("form");
String prcName = "重点认证标准/政策合规性项目审查流程";
// 提交方式，如果该字段不为空，则是定时器自动提交 定时器自动提交value:timerAutoSubmit // 提交方式，如果该字段不为空，则是定时器自动提交 定时器自动提交value:timerAutoSubmit
String submitMethod = object.getString("submitMethod"); String submitMethod = object.getString("submitMethod");
if (StringUtils.isEmpty(submitMethod)) { if (StringUtils.isEmpty(submitMethod)) {
@@ -41,7 +45,8 @@ public class PolicyComplianceProgramReviewProcess8After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("责任对接人汇总");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId((String) delegateTask.getVariable("djrUserId")); busProcessNewNext.setUserId((String) delegateTask.getVariable("djrUserId"));
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
@@ -84,7 +89,8 @@ public class PolicyComplianceProgramReviewProcess8After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("管理员");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(glyUserId); busProcessNewNext.setUserId(glyUserId);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
@@ -92,16 +98,25 @@ public class PolicyComplianceProgramReviewProcess8After implements TaskListener
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
busProcessNew.setMsgType("clause"); queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
busProcessNew.setPId(delegateTask.getProcessInstanceId()); List<BusProcessNew> list = busBean.list(queryWrapper1);
busProcessNew.setMesg(object.toJSONString()); if (CollectionUtils.isNotEmpty(list)) {
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); BusProcessNew busProcessNew = list.get(0);
busProcessNew.setTaskId(delegateTask.getId()); busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText")); busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0"); busBean.saveOrUpdate(busProcessNew);
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);
delegateTask.setVariable("submitMethod",submitMethod); delegateTask.setVariable("submitMethod",submitMethod);
} }
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess8Before.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess8Before implements TaskListener
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper = new QueryWrapper<>();
queryWrapper.isNull("TASK_ID"); queryWrapper.isNull("TASK_ID");
queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper.eq("USER_ID",delegateTask.getAssignee()); queryWrapper.eq("USER_ID",delegateTask.getAssignee());
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess9After.java
+29 -13
View File
@@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.policyComplianceProgramReviewProcess;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -13,6 +14,7 @@ import com.ydw.bat.wkflow.util.enums.ApprovalFlagEnum;
import com.ydw.bat.wkflow.util.enums.FlowTypeEnum; import com.ydw.bat.wkflow.util.enums.FlowTypeEnum;
import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener; import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
@@ -33,6 +35,8 @@ public class PolicyComplianceProgramReviewProcess9After implements TaskListener
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject jsonForm = object.getJSONObject("form"); JSONObject jsonForm = object.getJSONObject("form");
String prcName = "重点认证标准/政策合规性项目审查流程";
String approvalFlag = jsonForm.getString("approvalFlag"); String approvalFlag = jsonForm.getString("approvalFlag");
// 提交方式，如果该字段不为空，则是定时器自动提交 定时器自动提交value:timerAutoSubmit // 提交方式，如果该字段不为空，则是定时器自动提交 定时器自动提交value:timerAutoSubmit
@@ -48,7 +52,8 @@ public class PolicyComplianceProgramReviewProcess9After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("责任单位审批");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(zrdwUserId); busProcessNewNext.setUserId(zrdwUserId);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
@@ -74,7 +79,8 @@ public class PolicyComplianceProgramReviewProcess9After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("责任人任务处理");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(nextUser); busProcessNewNext.setUserId(nextUser);
addBusProcessNewList.add(busProcessNewNext); addBusProcessNewList.add(busProcessNewNext);
} }
@@ -98,7 +104,8 @@ public class PolicyComplianceProgramReviewProcess9After implements TaskListener
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo("管理员");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(glyUserId); busProcessNewNext.setUserId(glyUserId);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
@@ -123,16 +130,25 @@ public class PolicyComplianceProgramReviewProcess9After implements TaskListener
} }
// 存储当前节点意见 // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
busProcessNew.setMsgType("clause"); queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
busProcessNew.setPId(delegateTask.getProcessInstanceId()); List<BusProcessNew> list = busBean.list(queryWrapper1);
busProcessNew.setMesg(object.toJSONString()); if (CollectionUtils.isNotEmpty(list)) {
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); BusProcessNew busProcessNew = list.get(0);
busProcessNew.setTaskId(delegateTask.getId()); busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText")); busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0"); busBean.saveOrUpdate(busProcessNew);
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);
delegateTask.setVariable("approvalFlag", approvalFlag); delegateTask.setVariable("approvalFlag", approvalFlag);
delegateTask.setVariable("submitMethod", submitMethod); delegateTask.setVariable("submitMethod", submitMethod);
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess9Before.java
+1 -1
View File
@@ -19,7 +19,7 @@ public class PolicyComplianceProgramReviewProcess9Before implements TaskListener
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper = new QueryWrapper(); QueryWrapper<BusProcessNew> queryWrapper = new QueryWrapper<>();
queryWrapper.isNull("TASK_ID"); queryWrapper.isNull("TASK_ID");
queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper.eq("USER_ID",delegateTask.getAssignee()); queryWrapper.eq("USER_ID",delegateTask.getAssignee());