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-01-02 08:58:54 +08:00
parent 13a79a5be9
commit 603b5c19ba
15 changed files with 144 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BLApplicantAfter.java
+7
View File
@@ -141,6 +141,13 @@ public class BLApplicantAfter implements TaskListener{
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
if (form == object) {
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java
+12 -5
View File
@@ -94,9 +94,21 @@ public class BussLibraryProduct10After implements TaskListener{
} else {
delegateTask.setVariable("approveReject",1);
if(StringUtils.isNotBlank(roleForm.getString("bussUser6"))) {
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText,"1");
delegateTask.setVariable("bussUserC6",object.getString("bussUser6"));
delegateTask.setVariable("bussP10Flag", 1);
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
if (form == object) {
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
@@ -104,11 +116,6 @@ public class BussLibraryProduct10After implements TaskListener{
busProcessNew.setUserId(roleForm.getString("bussUser6"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText,"1");
delegateTask.setVariable("bussUserC6",object.getString("bussUser6"));
delegateTask.setVariable("bussP10Flag", 1);
}else {
throw new ActivitiException("1#2意见汇总及标准修改参数不存在,请配置相关用户");
}
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct11After.java
+13 -5
View File
@@ -90,9 +90,22 @@ public class BussLibraryProduct11After implements TaskListener{
}
} else {
if(StringUtils.isNotBlank(roleForm.getString("bussUser6"))) {
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText, "1");
delegateTask.setVariable("bussUserC6",object.getString("bussUser6"));
delegateTask.setVariable("bussP11Flag", 1);
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
if (form == object) {
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
@@ -100,11 +113,6 @@ public class BussLibraryProduct11After implements TaskListener{
busProcessNew.setUserId(roleForm.getString("bussUser6"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText, "1");
delegateTask.setVariable("bussUserC6",object.getString("bussUser6"));
delegateTask.setVariable("bussP11Flag", 1);
}else {
throw new ActivitiException("1#2意见汇总及标准修改参数不存在,请配置相关用户");
}
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12After.java
+13 -5
View File
@@ -98,9 +98,22 @@ public class BussLibraryProduct12After implements TaskListener{
}
} else {
if(StringUtils.isNotBlank(roleForm.getString("bussUser6"))) {
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText,"1");
delegateTask.setVariable("bussUserC6",object.getString("bussUser6"));
delegateTask.setVariable("bussP12Flag", 1);
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
if (form == object) {
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
@@ -108,11 +121,6 @@ public class BussLibraryProduct12After implements TaskListener{
busProcessNew.setUserId(roleForm.getString("bussUser6"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText,"1");
delegateTask.setVariable("bussUserC6",object.getString("bussUser6"));
delegateTask.setVariable("bussP12Flag", 1);
}else {
throw new ActivitiException("1#2意见汇总及标准修改参数不存在,请配置相关用户");
}
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct2After.java
+7
View File
@@ -109,6 +109,13 @@ public class BussLibraryProduct2After implements TaskListener{
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
if (form == object) {
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct3After.java
+7
View File
@@ -100,6 +100,13 @@ public class BussLibraryProduct3After implements TaskListener{
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
if (form == object) {
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct4After.java
+11 -5
View File
@@ -91,20 +91,26 @@ public class BussLibraryProduct4After implements TaskListener{
}
} else {
if(StringUtils.isNotBlank(roleForm.getString("bussUser3"))) {
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText,"1");
delegateTask.setVariable("bussUserC3",roleForm.getString("bussUser3"));
delegateTask.setVariable("bussP4Flag", 1);
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
if (form == object) {
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(roleForm.getString("bussUser3"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText,"1");
delegateTask.setVariable("bussUserC3",roleForm.getString("bussUser3"));
delegateTask.setVariable("bussP4Flag", 1);
}else {
throw new ActivitiException("1#2汇总用户参数不存在,请配置相关用户");
}
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java
+7
View File
@@ -109,6 +109,13 @@ public class BussLibraryProduct5After implements TaskListener{
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
if (form == object) {
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct6After.java
+7
View File
@@ -94,6 +94,13 @@ public class BussLibraryProduct6After implements TaskListener{
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
if (form == object) {
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java
+12 -5
View File
@@ -100,9 +100,21 @@ public class BussLibraryProduct7After implements TaskListener{
}
} else {
if(StringUtils.isNotBlank(roleForm.getString("bussUser6"))) {
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText,"1");
delegateTask.setVariable("bussUserC6",roleForm.getString("bussUser6"));
delegateTask.setVariable("bussP7Flag", 1);
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
if (form == object) {
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
@@ -110,11 +122,6 @@ public class BussLibraryProduct7After implements TaskListener{
busProcessNew.setUserId(roleForm.getString("bussUser6"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText,"1");
delegateTask.setVariable("bussUserC6",roleForm.getString("bussUser6"));
delegateTask.setVariable("bussP7Flag", 1);
}else {
throw new ActivitiException("1#2意见汇总及标准修改参数不存在,请配置相关用户");
}
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java
+13 -5
View File
@@ -104,9 +104,22 @@ public class BussLibraryProduct8After implements TaskListener{
} else {
delegateTask.setVariable("auditReject",1);
if(StringUtils.isNotBlank(roleForm.getString("bussUser6"))) {
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText,"1");
delegateTask.setVariable("bussUserC6",roleForm.getString("bussUser6"));
delegateTask.setVariable("bussP8Flag", 1);
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
if (form == object) {
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
@@ -114,11 +127,6 @@ public class BussLibraryProduct8After implements TaskListener{
busProcessNew.setUserId(roleForm.getString("bussUser6"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText,"1");
delegateTask.setVariable("bussUserC6",roleForm.getString("bussUser6"));
delegateTask.setVariable("bussP8Flag", 1);
}else {
throw new ActivitiException("1#2意见汇总及标准修改参数不存在,请配置相关用户");
}
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct9After.java
+13 -5
View File
@@ -90,9 +90,22 @@ public class BussLibraryProduct9After implements TaskListener{
}
} else {
if(StringUtils.isNotBlank(roleForm.getString("bussUser6"))) {
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText,"1");
delegateTask.setVariable("bussUserC6",roleForm.getString("bussUser6"));
delegateTask.setVariable("bussP9Flag", 1);
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
if (form == object) {
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
@@ -100,11 +113,6 @@ public class BussLibraryProduct9After implements TaskListener{
busProcessNew.setUserId(roleForm.getString("bussUser6"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText,"1");
delegateTask.setVariable("bussUserC6",roleForm.getString("bussUser6"));
delegateTask.setVariable("bussP9Flag", 1);
}else {
throw new ActivitiException("1#2意见汇总及标准修改参数不存在,请配置相关用户");
}
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC3After.java
+7
View File
@@ -101,6 +101,13 @@ public class BussLibraryProductC3After implements TaskListener{
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
if (form == object) {
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC6After.java
+7
View File
@@ -94,6 +94,13 @@ public class BussLibraryProductC6After implements TaskListener{
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
if (form == object) {
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussUtils.java
+8
View File
@@ -57,6 +57,14 @@ public class BussUtils {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
// 清空意见信息
JSONObject form = object.getJSONObject("form");
if(form == null){
object.put("commitText","");
} else {
form.put("commentText","");
object.put("form",form);
}
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());