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

项目评估驳回无数据问题修复

Browse Source
This commit is contained in:
yuezhihang
2021-12-28 20:03:10 +08:00
parent 13b1df2fbd
commit 9c9ba499ab
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java
+6 -1
View File
@@ -22,7 +22,12 @@ public class PCAComplianceAssessmentBefore implements TaskListener {
QueryWrapper queryWrapper1 = new QueryWrapper(); QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.eq("TASK_ID","GO"); if ("GO".equals(delegateTask.getVariable("GOGOGO"))) {
queryWrapper1.eq("TASK_ID", "GO");
delegateTask.setVariable("GOGOGO","1");
}else {
queryWrapper1.isNull("TASK_ID");
}
List<BusProcessNew> list = busBean.list(queryWrapper1); List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){ if(!list.isEmpty()){
BusProcessNew one1 = list.get(0); 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); 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()) { delegateTask.getVariable("workPeoples", List.class).size()) {
if (nextUserList != null && !nextUserList.isEmpty()) { if (nextUserList != null && !nextUserList.isEmpty()) {
for (String userId : nextUserList) { for (String userId : nextUserList) {
@@ -103,7 +103,9 @@ public class PCAbafgManagerApproveAfter 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.setTaskId("996"); if (null!=delegateTask.getVariable("pass")) {
busProcessNewNext.setTaskId("996");
}
busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(userId); busProcessNewNext.setUserId(userId);
busProcessNewNext.setPrcName(prcName); busProcessNewNext.setPrcName(prcName);
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java
+1 -1
View File
@@ -188,7 +188,7 @@ public class PCAffLiableDistributeAfter implements TaskListener {
busBean.saveOrUpdate(busProcessNews); busBean.saveOrUpdate(busProcessNews);
} }
} }
delegateTask.setVariable("GOGOGO","GO");
// 存储当前节点意见 // 存储当前节点意见
if (nextUserList != null && !nextUserList.isEmpty()) { if (nextUserList != null && !nextUserList.isEmpty()) {
for (String userId : nextUserList) { for (String userId : nextUserList) {