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

fix: 流程回执不显示修改

Browse Source
This commit is contained in:
wxyclub
2024-04-28 16:56:04 +08:00
parent c205381d52
commit 66ab2fd86f
18 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java
+2 -1
View File
@@ -11,6 +11,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
@@ -76,7 +77,7 @@ public class JSFstartAfter implements TaskListener {
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setUserId("start");
busProcessNews.setPrcName(prcName);
if (object.containsKey("commentText")) {
if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) {
busProcessNews.setCommitFlag("1");
busProcessNews.setCommitText(object.getString("commentText"));
}
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java
+1
View File
@@ -21,6 +21,7 @@ public class PRFApproveBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskInfo(delegateTask.getName());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java
+1
View File
@@ -21,6 +21,7 @@ public class PRFEngineerreviewBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskInfo(delegateTask.getName());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java
+1
View File
@@ -21,6 +21,7 @@ public class PRFFillinformationBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskInfo(delegateTask.getName());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java
+1
View File
@@ -21,6 +21,7 @@ public class PRFReviewdockBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskInfo(delegateTask.getName());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java
+1
View File
@@ -21,6 +21,7 @@ public class PRFUnderengineerBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskInfo(delegateTask.getName());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java
+16 -14
View File
@@ -11,6 +11,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
@@ -33,7 +34,7 @@ public class PRFstartAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList();
List<String> nextUserList = new ArrayList<>();
String ids=object.getString("dockUser");
if(ids.contains(",")){
nextUserList=new ArrayList<>(Arrays.asList(ids.split(",")));
@@ -55,7 +56,7 @@ public class PRFstartAfter implements TaskListener {
delegateTask.setVariable("prcCreateUserName", username);
String prcName = "参与外部标准制修订备案-备案任务下发";
QueryWrapper queryWrapper2 = new QueryWrapper();
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -67,20 +68,21 @@ public class PRFstartAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
if (null != object.getString("commentText")) {
BusProcessNew busProcessNews = new BusProcessNew();
busProcessNews.setMsgType("clause");
busProcessNews.setPId(delegateTask.getProcessInstanceId());
busProcessNews.setMesg(object.toJSONString());
busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNews.setFinishFlag("0");
busProcessNews.setTaskInfo(delegateTask.getName());
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setUserId("start");
busProcessNews.setPrcName(prcName);
BusProcessNew busProcessNews = new BusProcessNew();
busProcessNews.setMsgType("clause");
busProcessNews.setPId(delegateTask.getProcessInstanceId());
busProcessNews.setMesg(object.toJSONString());
busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNews.setFinishFlag("0");
busProcessNews.setTaskInfo(delegateTask.getName());
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setUserId("start");
busProcessNews.setPrcName(prcName);
if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) {
busProcessNews.setCommitFlag("1");
busProcessNews.setCommitText(object.getString("commentText"));
busBean.save(busProcessNews);
}
busBean.save(busProcessNews);
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java
+16 -12
View File
@@ -11,6 +11,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -69,20 +71,22 @@ public class RAstartAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
if (null != object.getString("commentText")) {
BusProcessNew busProcessNews = new BusProcessNew();
busProcessNews.setMsgType("clause");
busProcessNews.setPId(delegateTask.getProcessInstanceId());
busProcessNews.setMesg(object.toJSONString());
busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNews.setFinishFlag("0");
busProcessNews.setTaskInfo(delegateTask.getName());
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setUserId("start");
busProcessNews.setPrcName(prcName);
BusProcessNew busProcessNews = new BusProcessNew();
busProcessNews.setMsgType("clause");
busProcessNews.setPId(delegateTask.getProcessInstanceId());
busProcessNews.setMesg(object.toJSONString());
busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNews.setFinishFlag("0");
busProcessNews.setTaskInfo(delegateTask.getName());
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setUserId("start");
busProcessNews.setPrcName(prcName);
if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) {
busProcessNews.setCommitFlag("1");
busProcessNews.setCommitText(object.getString("commentText"));
busBean.save(busProcessNews);
}
busBean.save(busProcessNews);
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java
+1
View File
@@ -24,6 +24,7 @@ public class ChargeVerifyBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskInfo(delegateTask.getName());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java
+1
View File
@@ -23,6 +23,7 @@ public class DirectorChooseBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskInfo(delegateTask.getName());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java
+1
View File
@@ -23,6 +23,7 @@ public class EngineerReviseBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskInfo(delegateTask.getName());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java
+1
View File
@@ -23,6 +23,7 @@ public class EngineerReviseDoneBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskInfo(delegateTask.getName());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java
+1
View File
@@ -23,6 +23,7 @@ public class LeaderVerifyBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskInfo(delegateTask.getName());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java
+1
View File
@@ -23,6 +23,7 @@ public class ManageSignBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskInfo(delegateTask.getName());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java
+1
View File
@@ -23,6 +23,7 @@ public class PresidentVerifyBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskInfo(delegateTask.getName());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java
+5 -4
View File
@@ -61,7 +61,7 @@ public class WriteMaterialAfter implements TaskListener {
String standName = object.getString("listName");
delegateTask.setVariable("listName", standName);
QueryWrapper queryWrapper2 = new QueryWrapper();
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
@@ -71,7 +71,6 @@ public class WriteMaterialAfter implements TaskListener {
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
if (null != object.getString("commentText")) {
BusProcessNew busProcessNews = new BusProcessNew();
busProcessNews.setMsgType("clause");
busProcessNews.setPId(delegateTask.getProcessInstanceId());
@@ -82,9 +81,11 @@ public class WriteMaterialAfter implements TaskListener {
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setUserId("start");
busProcessNews.setPrcName(prcName);
busProcessNews.setCommitText(object.getString("commentText"));
if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) {
busProcessNews.setCommitFlag("1");
busProcessNews.setCommitText(object.getString("commentText"));
}
busBean.save(busProcessNews);
}
JSONObject object1 = object.getJSONObject("ch_pageData");
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java
+1
View File
@@ -24,6 +24,7 @@ public class WriteMaterialBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskInfo(delegateTask.getName());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java
+1
View File
@@ -23,6 +23,7 @@ public class WriteMemberInfoBefore implements TaskListener {
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskInfo(delegateTask.getName());
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);