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 14:20:31 +08:00
parent 0929339284
commit 3348d32527
5 changed files with 76 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess13After.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;
@@ -34,6 +35,8 @@ public class PolicyComplianceProgramReviewProcess13After 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 sdr2UserPassCount = (int) delegateTask.getVariable("sdr2UserPassCount"); int sdr2UserPassCount = (int) delegateTask.getVariable("sdr2UserPassCount");
@@ -52,7 +55,8 @@ public class PolicyComplianceProgramReviewProcess13After 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(pzr2UserId); busProcessNewNext.setUserId(pzr2UserId);
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
delegateTask.setVariable("pzr2UserId", pzr2UserId); delegateTask.setVariable("pzr2UserId", pzr2UserId);
@@ -65,7 +69,8 @@ public class PolicyComplianceProgramReviewProcess13After 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);
@@ -74,16 +79,25 @@ public class PolicyComplianceProgramReviewProcess13After 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/PolicyComplianceProgramReviewProcess14After.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;
@@ -34,6 +35,8 @@ public class PolicyComplianceProgramReviewProcess14After 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 csrUserIds = jsonForm.getString("csrUserIds"); String csrUserIds = jsonForm.getString("csrUserIds");
@@ -47,7 +50,8 @@ public class PolicyComplianceProgramReviewProcess14After 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);
} }
@@ -64,7 +68,8 @@ public class PolicyComplianceProgramReviewProcess14After 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);
@@ -72,16 +77,25 @@ public class PolicyComplianceProgramReviewProcess14After 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/PolicyComplianceProgramReviewProcess14Before.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess14Before 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/PolicyComplianceProgramReviewProcess15After.java
+22 -11
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_auth.LawsUserInfoService; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
@@ -15,6 +16,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
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.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@@ -73,7 +75,7 @@ public class PolicyComplianceProgramReviewProcess15After implements TaskListener
); );
if (!existTaskFlag) { if (!existTaskFlag) {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
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) {
@@ -83,16 +85,25 @@ public class PolicyComplianceProgramReviewProcess15After 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);
// 抄送完成后修改标准跟踪清单中状态 // 抄送完成后修改标准跟踪清单中状态
// 如果是从标准跟踪清单下发的流程 需要修改主服务表中的流程状态，修改为 已完成 // 如果是从标准跟踪清单下发的流程 需要修改主服务表中的流程状态，修改为 已完成
src/main/java/com/ydw/bat/wkflow/listener/policyComplianceProgramReviewProcess/PolicyComplianceProgramReviewProcess15Before.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class PolicyComplianceProgramReviewProcess15Before 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());