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-30 17:15:35 +08:00
parent 8a718ff5b5
commit 970f4468a9
8 changed files with 147 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java
+12 -14
View File
@@ -71,20 +71,18 @@ public class DirectorSignAfter implements TaskListener {
} }
//存储当前节点意见 //存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); if (null != object.getString("commentText")) {
busProcessNew.setMsgType("clause"); QueryWrapper queryWrapper3 = new QueryWrapper();
busProcessNew.setPId(delegateTask.getProcessInstanceId()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
busProcessNew.setMesg(object.toJSONString()); queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); List<BusProcessNew> list = busBean.list(queryWrapper3);
busProcessNew.setTaskId(delegateTask.getId()); if (!list.isEmpty()) {
busProcessNew.setCommitText(object.getString("commentText")); BusProcessNew busProcessNews = list.get(0);
busProcessNew.setFinishFlag("0"); busProcessNews.setTaskId(delegateTask.getId());
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
QueryWrapper updataWapper=new QueryWrapper(); }
updataWapper.eq("TASK_ID",delegateTask.getId()); }
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if (delegateTask.getVariable("countSign",Integer.class)>=delegateTask.getVariable("directorUserList",List.class).size()) { if (delegateTask.getVariable("countSign",Integer.class)>=delegateTask.getVariable("directorUserList",List.class).size()) {
if ("true".equals(delegateTask.getVariable("7Mark", String.class))) { if ("true".equals(delegateTask.getVariable("7Mark", String.class))) {
delegateTask.setVariable("actionFlag", 0); delegateTask.setVariable("actionFlag", 0);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java
+12 -14
View File
@@ -57,20 +57,18 @@ public class DockingApprovalAfter implements TaskListener {
} }
//存储当前节点意见 //存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); if (null != object.getString("commentText")) {
busProcessNew.setMsgType("clause"); QueryWrapper queryWrapper3 = new QueryWrapper();
busProcessNew.setPId(delegateTask.getProcessInstanceId()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
busProcessNew.setMesg(object.toJSONString()); queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); List<BusProcessNew> list = busBean.list(queryWrapper3);
busProcessNew.setTaskId(delegateTask.getId()); if (!list.isEmpty()) {
busProcessNew.setCommitText(object.getString("commentText")); BusProcessNew busProcessNews = list.get(0);
busProcessNew.setFinishFlag("0"); busProcessNews.setTaskId(delegateTask.getId());
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
QueryWrapper updataWapper=new QueryWrapper(); }
updataWapper.eq("TASK_ID",delegateTask.getId()); }
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if (nextUserList != null && !nextUserList.isEmpty()) { if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) { for (String nextUser : nextUserList) {
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java
+12 -14
View File
@@ -67,20 +67,18 @@ public class MinisterAndDockerSignAfter implements TaskListener {
//存储当前节点意见 //存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); if (null != object.getString("commentText")) {
busProcessNew.setMsgType("clause"); QueryWrapper queryWrapper3 = new QueryWrapper();
busProcessNew.setPId(delegateTask.getProcessInstanceId()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
busProcessNew.setMesg(object.toJSONString()); queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); List<BusProcessNew> list = busBean.list(queryWrapper3);
busProcessNew.setTaskId(delegateTask.getId()); if (!list.isEmpty()) {
busProcessNew.setCommitText(object.getString("commentText")); BusProcessNew busProcessNews = list.get(0);
busProcessNew.setFinishFlag("0"); busProcessNews.setTaskId(delegateTask.getId());
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
QueryWrapper updataWapper=new QueryWrapper(); }
updataWapper.eq("TASK_ID",delegateTask.getId()); }
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
Integer count = 0; Integer count = 0;
if (null!=delegateTask.getVariable("task3OKCount",Integer.class)) { if (null!=delegateTask.getVariable("task3OKCount",Integer.class)) {
count = delegateTask.getVariable("task3OKCount", Integer.class); count = delegateTask.getVariable("task3OKCount", Integer.class);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java
+12 -14
View File
@@ -59,20 +59,18 @@ public class PresidentSignAfter implements TaskListener {
} }
//存储当前节点意见 //存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); if (null != object.getString("commentText")) {
busProcessNew.setMsgType("clause"); QueryWrapper queryWrapper3 = new QueryWrapper();
busProcessNew.setPId(delegateTask.getProcessInstanceId()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
busProcessNew.setMesg(object.toJSONString()); queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); List<BusProcessNew> list = busBean.list(queryWrapper3);
busProcessNew.setTaskId(delegateTask.getId()); if (!list.isEmpty()) {
busProcessNew.setCommitText(object.getString("commentText")); BusProcessNew busProcessNews = list.get(0);
busProcessNew.setFinishFlag("0"); busProcessNews.setTaskId(delegateTask.getId());
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
QueryWrapper updataWapper=new QueryWrapper(); }
updataWapper.eq("TASK_ID",delegateTask.getId()); }
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if (nextUserList != null && !nextUserList.isEmpty()) { if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) { for (String nextUser : nextUserList) {
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java
+23 -15
View File
@@ -48,8 +48,6 @@ public class ResponUserSignAfter implements TaskListener {
} }
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
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("startId", String.class); String user = delegateTask.getVariable("startId", String.class);
@@ -69,20 +67,25 @@ public class ResponUserSignAfter implements TaskListener {
} }
//存储当前节点意见 //存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); if (null != object.getString("commentText")) {
busProcessNew.setMsgType("clause"); QueryWrapper queryWrapper3 = new QueryWrapper();
busProcessNew.setPId(delegateTask.getProcessInstanceId()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
busProcessNew.setMesg(object.toJSONString()); queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); List<BusProcessNew> list = busBean.list(queryWrapper3);
busProcessNew.setTaskId(delegateTask.getId()); if (!list.isEmpty()) {
busProcessNew.setCommitText(object.getString("commentText")); BusProcessNew busProcessNews = list.get(0);
busProcessNew.setFinishFlag("0"); busProcessNews.setTaskId(delegateTask.getId());
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId()); if (null!=delegateTask.getVariable("cs")){
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId()); delegateTask.setVariable("cs",delegateTask.getVariable("cs",Integer.class)+1);
busBean.update(busProcessNew,updataWapper); }else {
delegateTask.setVariable("cs",1);
}
Integer count = delegateTask.getVariable("task2OKCount", Integer.class); Integer count = delegateTask.getVariable("task2OKCount", Integer.class);
JSONArray responUserList = delegateTask.getVariable("responUserList", JSONArray.class); JSONArray responUserList = delegateTask.getVariable("responUserList", JSONArray.class);
@@ -96,6 +99,7 @@ public class ResponUserSignAfter implements TaskListener {
count++; count++;
delegateTask.setVariable("task2OKCount", count); delegateTask.setVariable("task2OKCount", count);
} }
if (delegateTask.getVariable("cs",Integer.class)>= delegateTask.getVariable("responUserLists",List.class).size()) {
if (count >= responUserList.size()) { if (count >= responUserList.size()) {
if (delegateTask.getVariable("actionFlag", Integer.class) == 0) { if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
if (nextUserList != null && !nextUserList.isEmpty()) { if (nextUserList != null && !nextUserList.isEmpty()) {
@@ -119,7 +123,10 @@ public class ResponUserSignAfter implements TaskListener {
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
} }
}
} else { } else {
delegateTask.setVariable("actionFlag",1);
delegateTask.setVariable("cs",0);
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -131,6 +138,7 @@ public class ResponUserSignAfter implements TaskListener {
busBean.save(busProcessNewNext); busBean.save(busProcessNewNext);
} }
} }
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java
+12 -14
View File
@@ -91,20 +91,18 @@ public class SelectResponsibleUserAfter implements TaskListener {
} }
//存储当前节点意见 //存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); if (null != object.getString("commentText")) {
busProcessNew.setMsgType("clause"); QueryWrapper queryWrapper3 = new QueryWrapper();
busProcessNew.setPId(delegateTask.getProcessInstanceId()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
busProcessNew.setMesg(object.toJSONString()); queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); List<BusProcessNew> list = busBean.list(queryWrapper3);
busProcessNew.setTaskId(delegateTask.getId()); if (!list.isEmpty()) {
busProcessNew.setCommitText(object.getString("commentText")); BusProcessNew busProcessNews = list.get(0);
busProcessNew.setFinishFlag("0"); busProcessNews.setTaskId(delegateTask.getId());
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
QueryWrapper updataWapper=new QueryWrapper(); }
updataWapper.eq("TASK_ID",delegateTask.getId()); }
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
Integer count=delegateTask.getVariable("selectResponCount",Integer.class); Integer count=delegateTask.getVariable("selectResponCount",Integer.class);
if(count==null)count=0; if(count==null)count=0;
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java
+12 -14
View File
@@ -65,20 +65,18 @@ public class SummarySurveyAfter implements TaskListener {
} }
//存储当前节点意见 //存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); if (null != object.getString("commentText")) {
busProcessNew.setMsgType("clause"); QueryWrapper queryWrapper3 = new QueryWrapper();
busProcessNew.setPId(delegateTask.getProcessInstanceId()); queryWrapper3.eq("TASK_ID", delegateTask.getId());
busProcessNew.setMesg(object.toJSONString()); queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); List<BusProcessNew> list = busBean.list(queryWrapper3);
busProcessNew.setTaskId(delegateTask.getId()); if (!list.isEmpty()) {
busProcessNew.setCommitText(object.getString("commentText")); BusProcessNew busProcessNews = list.get(0);
busProcessNew.setFinishFlag("0"); busProcessNews.setTaskId(delegateTask.getId());
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
QueryWrapper updataWapper=new QueryWrapper(); }
updataWapper.eq("TASK_ID",delegateTask.getId()); }
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
if(nextUserList != null && !nextUserList.isEmpty()){ if(nextUserList != null && !nextUserList.isEmpty()){
for(Object nextUser1 : nextUserList){ for(Object nextUser1 : nextUserList){
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyBefore.java
+1
View File
@@ -21,6 +21,7 @@ public class SummarySurveyBefore implements TaskListener {
QueryWrapper queryWrapper1 = new QueryWrapper(); QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.isNull("TASK_ID"); queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1); List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){ if(!list.isEmpty()){