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
+13 -15
View File
@@ -70,21 +70,19 @@ public class DirectorSignAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
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());
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
//存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
if (delegateTask.getVariable("countSign",Integer.class)>=delegateTask.getVariable("directorUserList",List.class).size()) {
if ("true".equals(delegateTask.getVariable("7Mark", String.class))) {
delegateTask.setVariable("actionFlag", 0);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java
+13 -15
View File
@@ -56,21 +56,19 @@ public class DockingApprovalAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
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());
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
//存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java
+13 -15
View File
@@ -66,21 +66,19 @@ public class MinisterAndDockerSignAfter implements TaskListener {
// 存储当前节点意见
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());
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
//存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
Integer count = 0;
if (null!=delegateTask.getVariable("task3OKCount",Integer.class)) {
count = delegateTask.getVariable("task3OKCount", Integer.class);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java
+13 -15
View File
@@ -58,21 +58,19 @@ public class PresidentSignAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
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());
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
//存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java
+68 -60
View File
@@ -30,36 +30,34 @@ public class ResponUserSignAfter implements TaskListener {
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList();
List<String> userList=delegateTask.getVariable("userList",List.class);
String startUser=delegateTask.getVariable("startUser",String.class);
List<String> userList = delegateTask.getVariable("userList", List.class);
String startUser = delegateTask.getVariable("startUser", String.class);
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if("1".equals(object.getString("actionFlag"))){
delegateTask.setVariable("actionFlag",1);
nextUserList.add(delegateTask.getVariable("startUser",String.class));
if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
if ("1".equals(object.getString("actionFlag"))) {
delegateTask.setVariable("actionFlag", 1);
nextUserList.add(delegateTask.getVariable("startUser", String.class));
}
}
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
nextUserList=userList;
if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
nextUserList = userList;
}
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("startId",String.class);
String username = delegateTask.getVariable("startName",String.class);
String standName = delegateTask.getVariable("title",String.class);
String prcName = standName+"-标准调研流程";
String user = delegateTask.getVariable("startId", String.class);
String username = delegateTask.getVariable("startName", String.class);
String standName = delegateTask.getVariable("title", String.class);
String prcName = standName + "-标准调研流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
if (one1 != null) {
// one1.setOverTime(OVERTIME);
one1.setPrcType("2");
one1.setPrcName(prcName);
@@ -68,58 +66,67 @@ public class ResponUserSignAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
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());
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
Integer count=delegateTask.getVariable("task2OKCount",Integer.class);
JSONArray responUserList=delegateTask.getVariable("responUserList", JSONArray.class);
//存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
if(count==null)count=1;
if (null!=delegateTask.getVariable("cs")){
delegateTask.setVariable("cs",delegateTask.getVariable("cs",Integer.class)+1);
}else {
delegateTask.setVariable("cs",1);
}
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
Integer count = delegateTask.getVariable("task2OKCount", Integer.class);
JSONArray responUserList = delegateTask.getVariable("responUserList", JSONArray.class);
if (count == null) count = 1;
if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
count++;
delegateTask.setVariable("task2OKCount",count);
delegateTask.setVariable("task2OKCount", count);
}
if(count>=responUserList.size()){
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if(nextUserList != null && !nextUserList.isEmpty()){
List<String> res=new ArrayList<>();
nextUserList.forEach(s -> {
if (!res.contains(s)){
res.add(s);
if (delegateTask.getVariable("cs",Integer.class)>= delegateTask.getVariable("responUserLists",List.class).size()) {
if (count >= responUserList.size()) {
if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
if (nextUserList != null && !nextUserList.isEmpty()) {
List<String> res = new ArrayList<>();
nextUserList.forEach(s -> {
if (!res.contains(s)) {
res.add(s);
}
});
delegateTask.setVariable("userList", res);
for (String nextUser : res) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
});
delegateTask.setVariable("userList",res);
for(String nextUser : res){
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
}else {
} else {
delegateTask.setVariable("actionFlag",1);
delegateTask.setVariable("cs",0);
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -131,6 +138,7 @@ public class ResponUserSignAfter implements TaskListener {
busBean.save(busProcessNewNext);
}
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserAfter.java
+13 -15
View File
@@ -90,21 +90,19 @@ public class SelectResponsibleUserAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
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());
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
//存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
Integer count=delegateTask.getVariable("selectResponCount",Integer.class);
if(count==null)count=0;
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyAfter.java
+13 -15
View File
@@ -64,21 +64,19 @@ public class SummarySurveyAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
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());
QueryWrapper updataWapper=new QueryWrapper();
updataWapper.eq("TASK_ID",delegateTask.getId());
updataWapper.eq("P_ID",delegateTask.getProcessInstanceId());
busBean.update(busProcessNew,updataWapper);
//存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
if(nextUserList != null && !nextUserList.isEmpty()){
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();
queryWrapper1.isNull("TASK_ID");
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){