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

项目维度第二步驳回 流程完成时间 未显示bug修复

Browse Source
This commit is contained in:
yuezhihang
2021-12-28 13:34:58 +08:00
parent 42bc160df9
commit 2f66177b85
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveAfter.java
+22 -15
View File
@@ -37,28 +37,35 @@ public class PCAbzManagerApproveAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object); delegateTask.setVariable("objectJson", object);
//后续节点所需要的数据 //后续节点所需要的数据
List<String> nextUserList=new ArrayList<>(); List<String> nextUserList = new ArrayList<>();
if ("1".equals(object.getString("BZFlag"))){ if ("1".equals(object.getString("BZFlag"))) {
delegateTask.setVariable("BZFlag","1"); delegateTask.setVariable("BZFlag", "1");
delegateTask.setVariable("GCUserId",String.valueOf(delegateTask.getVariable("gcjl"))); delegateTask.setVariable("GCUserId", String.valueOf(delegateTask.getVariable("gcjl")));
nextUserList.add(String.valueOf(delegateTask.getVariable("gcjl"))); nextUserList.add(String.valueOf(delegateTask.getVariable("gcjl")));
}else { } else {
//流程直接结束，抄送消息提示 //流程直接结束，抄送消息提示
delegateTask.setVariable("BZFlag","2"); delegateTask.setVariable("BZFlag", "2");
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
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());
String user = delegateTask.getVariable("prcCreateUser",String.class); String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName",String.class); String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = delegateTask.getVariable("stId",String.class)+"-合规评估流程-工程经理转办"; String prcName="";
if ("1".equals(object.getString("BZFlag"))) {
prcName= delegateTask.getVariable("stId", String.class) + "-合规评估流程-工程经理转办";
}else {
prcName= delegateTask.getVariable("stId", String.class) + "-合规评估流程-流程结束";
}
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) { if (one1 != null) {
// one1.setOverTime(OVERTIME); if (!"1".equals(object.getString("BZFlag"))) {
one1.setOverTime(OVERTIME);
}
one1.setPrcType("6"); one1.setPrcType("6");
one1.setPrcName(prcName); one1.setPrcName(prcName);
one1.setCreatUser(user); one1.setCreatUser(user);
@@ -67,20 +74,20 @@ public class PCAbzManagerApproveAfter implements TaskListener {
} }
// 存储当前节点意见1 // 存储当前节点意见1
if (null!=object.getString("commentText")) { if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper(); QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3); List<BusProcessNew> list = busBean.list(queryWrapper3);
if(!list.isEmpty()){ if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0); BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText")); busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews); busBean.saveOrUpdate(busProcessNews);
} }
} }
if(nextUserList != null && !nextUserList.isEmpty()){ if (nextUserList != null && !nextUserList.isEmpty()) {
for(String userId : nextUserList){ for (String userId : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());