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
2023-12-29 14:42:27 +08:00
parent 88344efad2
commit 13a79a5be9
32 changed files with 590 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BLApplicantAfter.java
+25 -14
View File
@@ -38,34 +38,45 @@ public class BLApplicantAfter implements TaskListener{
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
if (object.getString("standNum") != null && StringUtils.isNotBlank(object.getString("standName"))
&& object.getString("standNumber") != null && StringUtils.isNotBlank(object.getString("standNumber"))) {
object.put("standNum", object.getString("standNumber"));
}
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
if (form.getString("standNum") != null && StringUtils.isNotBlank(form.getString("standName"))
&& form.getString("standNumber") != null && StringUtils.isNotBlank(form.getString("standNumber"))) {
form.put("standNum", form.getString("standNumber"));
}
delegateTask.setVariable("objectJson",object);
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
// form.getString("standName")
String standName = "";
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
List<String> nextUserList = new ArrayStack<>();
if(StringUtils.isNotBlank(object.getString("bussUser2"))){
if(StringUtils.isNotBlank(roleForm.getString("bussUser2"))){
if(object.getString("bussUser2").contains(",")){
nextUserList = Arrays.asList(object.getString("bussUser2").split(","));
if(roleForm.getString("bussUser2").contains(",")){
nextUserList = Arrays.asList(roleForm.getString("bussUser2").split(","));
}else {
nextUserList.add(object.getString("bussUser2"));
nextUserList.add(roleForm.getString("bussUser2"));
}
// 配置多实例
delegateTask.setVariable("bussUser2List",nextUserList);
@@ -120,7 +131,7 @@ public class BLApplicantAfter implements TaskListener{
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setCommitText(form.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java
+31 -18
View File
@@ -8,7 +8,6 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
@@ -37,18 +36,31 @@ public class BussLibraryProduct10After implements TaskListener{
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
List<String> nextUserList = new ArrayList<>();
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
String approvalOpinion = form.get("approvalOpinion") == null ? "" : form.get("approvalOpinion").toString();
String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
@@ -62,17 +74,17 @@ public class BussLibraryProduct10After implements TaskListener{
if(StringUtils.isNotBlank(approvalOpinion)){
if ("0".equalsIgnoreCase(approvalOpinion)) {
if(StringUtils.isNotBlank(object.getString("bussUser12"))){
if(StringUtils.isNotBlank(roleForm.getString("bussUser12"))){
delegateTask.setVariable("approveUserThrough", (Integer) delegateTask.getVariable("approveUserThrough") + 1);
if (ObjectUtils.equals(delegateTask.getVariable("approveUserThrough"),delegateTask.getVariable("approveUserSize"))) {
if(object.getString("bussUser12").contains(",")){
nextUserList = Arrays.asList(object.getString("bussUser12").split(","));
if(roleForm.getString("bussUser12").contains(",")){
nextUserList = Arrays.asList(roleForm.getString("bussUser12").split(","));
}else {
nextUserList.add(object.getString("bussUser12"));
nextUserList.add(roleForm.getString("bussUser12"));
}
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
delegateTask.setVariable("bussUser12",object.getString("bussUser12"));
String commentText = form.getString("commentText");
BussUtils.approvalFunc2(delegateTask, object, commentText, prcName, nextUserList);
delegateTask.setVariable("bussUser12",roleForm.getString("bussUser12"));
delegateTask.setVariable("bussP10Flag", 0);
}
@@ -81,7 +93,7 @@ public class BussLibraryProduct10After implements TaskListener{
}
} else {
delegateTask.setVariable("approveReject",1);
if(StringUtils.isNotBlank(object.getString("bussUser6"))) {
if(StringUtils.isNotBlank(roleForm.getString("bussUser6"))) {
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
@@ -89,11 +101,12 @@ public class BussLibraryProduct10After implements TaskListener{
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("bussUser6"));
busProcessNew.setUserId(roleForm.getString("bussUser6"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText,"1");
delegateTask.setVariable("bussUserC6",object.getString("bussUser6"));
delegateTask.setVariable("bussP10Flag", 1);
}else {
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10Before.java
+1 -8
View File
@@ -1,6 +1,5 @@
package com.ydw.bat.wkflow.listener.bussLibraryProduct;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
@@ -18,13 +17,7 @@ public class BussLibraryProduct10Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct11After.java
+31 -17
View File
@@ -8,7 +8,6 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
@@ -36,18 +35,31 @@ public class BussLibraryProduct11After implements TaskListener{
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
List<String> nextUserList = new ArrayList<>();
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
String approvalOpinion = form.get("approvalOpinion") == null ? "" : form.get("approvalOpinion").toString();
String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
@@ -61,22 +73,23 @@ public class BussLibraryProduct11After implements TaskListener{
if(StringUtils.isNotBlank(approvalOpinion)){
if ("0".equalsIgnoreCase(approvalOpinion)) {
if(StringUtils.isNotBlank(object.getString("bussUser12"))){
if(StringUtils.isNotBlank(roleForm.getString("bussUser12"))){
if(object.getString("bussUser12").contains(",")){
nextUserList = Arrays.asList(object.getString("bussUser12").split(","));
if(roleForm.getString("bussUser12").contains(",")){
nextUserList = Arrays.asList(roleForm.getString("bussUser12").split(","));
}else {
nextUserList.add(object.getString("bussUser12"));
nextUserList.add(roleForm.getString("bussUser12"));
}
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
delegateTask.setVariable("bussUser12",object.getString("bussUser12"));
String commentText = form.getString("commentText");
BussUtils.approvalFunc2(delegateTask, object, commentText, prcName, nextUserList);
delegateTask.setVariable("bussUser12",roleForm.getString("bussUser12"));
delegateTask.setVariable("bussP11Flag", 0);
}else {
throw new ActivitiException("1#2总院平台总监/各事业部研发副总裁参数不存在,请配置相关用户");
}
} else {
if(StringUtils.isNotBlank(object.getString("bussUser6"))) {
if(StringUtils.isNotBlank(roleForm.getString("bussUser6"))) {
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
@@ -84,11 +97,12 @@ public class BussLibraryProduct11After implements TaskListener{
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("bussUser6"));
busProcessNew.setUserId(roleForm.getString("bussUser6"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText, "1");
delegateTask.setVariable("bussUserC6",object.getString("bussUser6"));
delegateTask.setVariable("bussP11Flag", 1);
}else {
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct11Before.java
+1 -8
View File
@@ -1,6 +1,5 @@
package com.ydw.bat.wkflow.listener.bussLibraryProduct;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
@@ -18,13 +17,7 @@ public class BussLibraryProduct11Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12After.java
+38 -25
View File
@@ -8,7 +8,6 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
@@ -34,29 +33,42 @@ public class BussLibraryProduct12After implements TaskListener{
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
// 确保企标编号出错问题 进行修复
if (object.get("standSort") != null && object.get("standNumber") != null && object.get("standYear") != null) {
String newStandCode = object.get("standSort").toString() + object.get("standNumber").toString() + "-" + object.get("standYear").toString();
object.put("standCode",newStandCode);
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
if (object.getString("standNum") != null && StringUtils.isNotBlank(object.getString("standName"))
&& object.getString("standNumber") != null && StringUtils.isNotBlank(object.getString("standNumber"))) {
object.put("standNum", object.getString("standNumber"));
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
// 确保企标编号出错问题 进行修复
if (form.get("standSort") != null && form.get("standNumber") != null && form.get("standYear") != null) {
String newStandCode = form.get("standSort").toString() + form.get("standNumber").toString() + "-" + form.get("standYear").toString();
form.put("standCode",newStandCode);
}
if (form.getString("standNum") != null && StringUtils.isNotBlank(form.getString("standName"))
&& form.getString("standNumber") != null && StringUtils.isNotBlank(form.getString("standNumber"))) {
form.put("standNum", form.getString("standNumber"));
}
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
List<String> nextUserList = new ArrayList<>();
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
String approvalOpinion = form.get("approvalOpinion") == null ? "" : form.get("approvalOpinion").toString();
String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
@@ -70,22 +82,22 @@ public class BussLibraryProduct12After implements TaskListener{
if(StringUtils.isNotBlank(approvalOpinion)){
if ("0".equalsIgnoreCase(approvalOpinion)) {
if(StringUtils.isNotBlank(object.getString("bussUser13"))){
if(StringUtils.isNotBlank(roleForm.getString("bussUser13"))){
if(object.getString("bussUser13").contains(",")){
nextUserList = Arrays.asList(object.getString("bussUser13").split(","));
if(roleForm.getString("bussUser13").contains(",")){
nextUserList = Arrays.asList(roleForm.getString("bussUser13").split(","));
}else {
nextUserList.add(object.getString("bussUser13"));
nextUserList.add(roleForm.getString("bussUser13"));
}
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
delegateTask.setVariable("bussUser13",object.getString("bussUser13"));
String commentText = form.getString("commentText");
BussUtils.approvalFunc2(delegateTask, object, commentText, prcName, nextUserList);
delegateTask.setVariable("bussUser13",roleForm.getString("bussUser13"));
delegateTask.setVariable("bussP12Flag", 0);
}else {
throw new ActivitiException("1#2总院平台总监/各事业部研发副总裁参数不存在,请配置相关用户");
}
} else {
if(StringUtils.isNotBlank(object.getString("bussUser6"))) {
if(StringUtils.isNotBlank(roleForm.getString("bussUser6"))) {
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
@@ -93,11 +105,12 @@ public class BussLibraryProduct12After implements TaskListener{
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("bussUser6"));
busProcessNew.setUserId(roleForm.getString("bussUser6"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
String commentText = form.getString("commentText");
BussUtils.approvalFunc1(delegateTask, busBean, commentText,"1");
delegateTask.setVariable("bussUserC6",object.getString("bussUser6"));
delegateTask.setVariable("bussP12Flag", 1);
}else {
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct12Before.java
+1 -8
View File
@@ -1,6 +1,5 @@
package com.ydw.bat.wkflow.listener.bussLibraryProduct;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
@@ -18,13 +17,7 @@ public class BussLibraryProduct12Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13After.java
+42 -8
View File
@@ -3,24 +3,21 @@ package com.ydw.bat.wkflow.listener.bussLibraryProduct;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
import com.ydw.bat.wkflow.business_main.datas.dto.WG.NewsFeed;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
/**
* 总院标准法规部产品标准工程师/各事业部标准化员发布后
@@ -39,10 +36,22 @@ public class BussLibraryProduct13After implements TaskListener{
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
@@ -57,7 +66,32 @@ public class BussLibraryProduct13After implements TaskListener{
// newsFeed.setReleaseDate(object.getString("issueTime"));
// lawsUserInfoService.insertNewsFeed(newsFeed);
// }
BussUtils.endFunc2(delegateTask, prcName,busBean, object, "0", busProcessNameService);
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
if (one2 != null) {
//one2.setPrcName("入库流程结束");
one2.setPrcName(prcName);
one2.setOverTime(OVERTIME);
one2.setPrcType("buss2");
busProcessNameService.saveOrUpdate(one2);
}
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1);
if (one1 != null) {
one1.setMsgType("clause");
one1.setPId(delegateTask.getProcessInstanceId());
one1.setMesg(object.toJSONString());
one1.setFinishFlag("0");
one1.setTaskInfo(delegateTask.getName());
one1.setPrcName(prcName);
one1.setCommitFlag("0");
one1.setCommitText(form.getString("commentText"));
busBean.saveOrUpdate(one1);
}
}
private String verifyObj(String str){
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct13Before.java
+1 -11
View File
@@ -1,9 +1,5 @@
package com.ydw.bat.wkflow.listener.bussLibraryProduct;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
@@ -21,13 +17,7 @@ public class BussLibraryProduct13Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct14After.java
+45 -8
View File
@@ -2,19 +2,19 @@ package com.ydw.bat.wkflow.listener.bussLibraryProduct;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
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.List;
import java.text.SimpleDateFormat;
import java.util.Date;
/**
* 抄送后
@@ -32,14 +32,51 @@ public class BussLibraryProduct14After implements TaskListener{
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
BussUtils.endFunc2(delegateTask, prcName,busBean, object, "0", busProcessNameService);
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
if (one2 != null) {
//one2.setPrcName("入库流程结束");
one2.setPrcName(prcName);
one2.setOverTime(OVERTIME);
one2.setPrcType("buss2");
busProcessNameService.saveOrUpdate(one2);
}
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1);
if (one1 != null) {
one1.setMsgType("clause");
one1.setPId(delegateTask.getProcessInstanceId());
one1.setMesg(object.toJSONString());
one1.setFinishFlag("0");
one1.setTaskInfo(delegateTask.getName());
one1.setPrcName(prcName);
one1.setCommitFlag("0");
one1.setCommitText(form.getString("commentText"));
busBean.saveOrUpdate(one1);
}
}
private String verifyObj(String str){
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct14Before.java
+1 -8
View File
@@ -1,6 +1,5 @@
package com.ydw.bat.wkflow.listener.bussLibraryProduct;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
@@ -18,13 +17,7 @@ public class BussLibraryProduct14Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct2After.java
+25 -13
View File
@@ -36,20 +36,32 @@ public class BussLibraryProduct2After implements TaskListener{
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
List<String> nextUserList = new ArrayList<>();
JSONArray fileList =delegateTask.getVariable("fileModelList", JSONArray.class);
if (fileList==null) {
fileList=new JSONArray();
}
fileList.addAll(object.getJSONArray("fileModelList"));
fileList.addAll(form.getJSONArray("fileModelList"));
delegateTask.setVariable("fileModelList",fileList);
if(StringUtils.isNotBlank(object.getString("bussUser3"))){
delegateTask.setVariable("bussUser3",object.getString("bussUser3"));
nextUserList.add(object.getString("bussUser3"));
if(StringUtils.isNotBlank(roleForm.getString("bussUser3"))){
delegateTask.setVariable("bussUser3",roleForm.getString("bussUser3"));
nextUserList.add(roleForm.getString("bussUser3"));
}else {
throw new ActivitiException("1#2主起草人不存在,请配置相关人员");
}
@@ -58,17 +70,17 @@ public class BussLibraryProduct2After implements TaskListener{
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
// form.getString("standName")
String standName = "";
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
@@ -87,7 +99,7 @@ public class BussLibraryProduct2After implements TaskListener{
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setCommitText(form.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct2Before.java
+1 -6
View File
@@ -18,12 +18,7 @@ public class BussLibraryProduct2Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct3After.java
+24 -12
View File
@@ -35,12 +35,24 @@ public class BussLibraryProduct3After implements TaskListener{
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
List<String> nextUserList = new ArrayList<>();
List<String> nextUserList = new ArrayList();
if(StringUtils.isNotBlank(object.getString("bussUser4"))){
delegateTask.setVariable("bussUser4",object.getString("bussUser4"));
nextUserList.add(object.getString("bussUser4"));
if(StringUtils.isNotBlank(roleForm.getString("bussUser4"))){
delegateTask.setVariable("bussUser4",roleForm.getString("bussUser4"));
nextUserList.add(roleForm.getString("bussUser4"));
}else {
throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
}
@@ -49,17 +61,17 @@ public class BussLibraryProduct3After implements TaskListener{
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
// form.getString("standName")
String standName = "";
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
@@ -78,7 +90,7 @@ public class BussLibraryProduct3After implements TaskListener{
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setCommitText(form.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct3Before.java
+1 -7
View File
@@ -21,13 +21,7 @@ public class BussLibraryProduct3Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
/**
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct4After.java
+31 -19
View File
@@ -8,7 +8,6 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
@@ -35,19 +34,32 @@ public class BussLibraryProduct4After implements TaskListener{
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
List<String> nextUserList = new ArrayList();
List<String> nextUserList = new ArrayList<>();
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
String approvalOpinion = form.get("approvalOpinion") == null ? "" : form.get("approvalOpinion").toString();
String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
@@ -61,15 +73,15 @@ public class BussLibraryProduct4After implements TaskListener{
if(StringUtils.isNotBlank(approvalOpinion)){
if ("0".equalsIgnoreCase(approvalOpinion)) {
if(StringUtils.isNotBlank(object.getString("bussUser5"))){
if(StringUtils.isNotBlank(roleForm.getString("bussUser5"))){
if(object.getString("bussUser5").contains(",")){
nextUserList = Arrays.asList(object.getString("bussUser5").split(","));
if(roleForm.getString("bussUser5").contains(",")){
nextUserList = Arrays.asList(roleForm.getString("bussUser5").split(","));
}else {
nextUserList.add(object.getString("bussUser5"));
nextUserList.add(roleForm.getString("bussUser5"));
}
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
String commentText = form.getString("commentText");
BussUtils.approvalFunc2(delegateTask, object,commentText, prcName, nextUserList);
// 配置多实例
delegateTask.setVariable("bussUser5List",nextUserList);
delegateTask.addCandidateUsers(nextUserList);
@@ -78,7 +90,7 @@ public class BussLibraryProduct4After implements TaskListener{
throw new ActivitiException("1#2会签用户参数不存在,请配置相关用户");
}
} else {
if(StringUtils.isNotBlank(object.getString("bussUser3"))) {
if(StringUtils.isNotBlank(roleForm.getString("bussUser3"))) {
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
@@ -86,12 +98,12 @@ public class BussLibraryProduct4After implements TaskListener{
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("bussUser3"));
busProcessNew.setUserId(roleForm.getString("bussUser3"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
delegateTask.setVariable("bussUserC3",object.getString("bussUser3"));
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/BussLibraryProduct4Before.java
+1 -7
View File
@@ -18,13 +18,7 @@ public class BussLibraryProduct4Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5After.java
+27 -15
View File
@@ -10,7 +10,6 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
@@ -36,36 +35,48 @@ public class BussLibraryProduct5After implements TaskListener{
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
List<String> nextUserList = new ArrayList<>();
JSONArray ideaList =delegateTask.getVariable("ideaList", JSONArray.class);
if (ideaList==null) {
ideaList=new JSONArray();
}
if (ObjectUtils.isNotEmpty(object.getJSONArray("modelData"))) {
ideaList.addAll(object.getJSONArray("modelData"));
if (ObjectUtils.isNotEmpty(form.getJSONArray("modelData"))) {
ideaList.addAll(form.getJSONArray("modelData"));
}
delegateTask.setVariable("ideaList",ideaList);
if(StringUtils.isNotBlank(object.getString("bussUser6"))){
delegateTask.setVariable("bussUser6",object.getString("bussUser6"));
nextUserList.add(object.getString("bussUser6"));
if(StringUtils.isNotBlank(roleForm.getString("bussUser6"))){
delegateTask.setVariable("bussUser6",roleForm.getString("bussUser6"));
nextUserList.add(roleForm.getString("bussUser6"));
}else {
throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
}
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
@@ -84,13 +95,14 @@ public class BussLibraryProduct5After implements TaskListener{
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setCommitText(form.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
// 评分存储
BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
String evaluationData = form.getString("evaluationData");
BussUtils.evalSave(delegateTask, evaluationData, prcName, delegateTask.getAssignee());
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct5Before.java
+1 -7
View File
@@ -18,13 +18,7 @@ public class BussLibraryProduct5Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct6After.java
+23 -10
View File
@@ -34,25 +34,38 @@ public class BussLibraryProduct6After implements TaskListener{
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
List<String> nextUserList = new ArrayList<>();
if(StringUtils.isNotBlank(object.getString("bussUser7"))){
delegateTask.setVariable("bussUser7",object.getString("bussUser7"));
nextUserList.add(object.getString("bussUser7"));
if(StringUtils.isNotBlank(roleForm.getString("bussUser7"))){
delegateTask.setVariable("bussUser7",roleForm.getString("bussUser7"));
nextUserList.add(roleForm.getString("bussUser7"));
}else {
throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
}
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
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 +84,7 @@ public class BussLibraryProduct6After implements TaskListener{
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setCommitText(form.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct6Before.java
+1 -8
View File
@@ -3,7 +3,6 @@ package com.ydw.bat.wkflow.listener.bussLibraryProduct;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
@@ -21,13 +20,7 @@ public class BussLibraryProduct6Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java
+32 -17
View File
@@ -8,7 +8,6 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
@@ -36,17 +35,31 @@ public class BussLibraryProduct7After implements TaskListener{
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
//截止时间 流程描述 创建人
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
String approvalOpinion = form.get("approvalOpinion") == null ? "" : form.get("approvalOpinion").toString();
String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
@@ -58,23 +71,24 @@ public class BussLibraryProduct7After implements TaskListener{
busProcessNameService.saveOrUpdate(one1);
}
List<String> nextUserList = new ArrayList();
List<String> nextUserList = new ArrayList<>();
if(StringUtils.isNotBlank(approvalOpinion)){
if ("0".equalsIgnoreCase(approvalOpinion)) {
if(StringUtils.isNotBlank(object.getString("bussUser8"))){
if(StringUtils.isNotBlank(roleForm.getString("bussUser8"))){
if(object.getString("bussUser8").contains(",")){
nextUserList = Arrays.asList(object.getString("bussUser8").split(","));
if(roleForm.getString("bussUser8").contains(",")){
nextUserList = Arrays.asList(roleForm.getString("bussUser8").split(","));
}else {
nextUserList.add(object.getString("bussUser8"));
nextUserList.add(roleForm.getString("bussUser8"));
}
// 配置多实例
delegateTask.setVariable("bussUser8List",nextUserList);
delegateTask.addCandidateUsers(nextUserList);
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
String commentText = form.getString("commentText");
BussUtils.approvalFunc2(delegateTask, object, commentText, prcName, nextUserList);
delegateTask.setVariable("bussP7Flag", 0);
//设置下个审批节点操作人数量+通过人数量
@@ -85,7 +99,7 @@ public class BussLibraryProduct7After implements TaskListener{
throw new ActivitiException("1#2总院标准法规部产品标准工程师/各事业部标准法规部参数不存在,请配置相关用户");
}
} else {
if(StringUtils.isNotBlank(object.getString("bussUser6"))) {
if(StringUtils.isNotBlank(roleForm.getString("bussUser6"))) {
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
@@ -93,12 +107,13 @@ public class BussLibraryProduct7After implements TaskListener{
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("bussUser6"));
busProcessNew.setUserId(roleForm.getString("bussUser6"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
delegateTask.setVariable("bussUserC6",object.getString("bussUser6"));
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/BussLibraryProduct7Before.java
+1 -7
View File
@@ -21,13 +21,7 @@ public class BussLibraryProduct7Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java
+31 -17
View File
@@ -8,7 +8,6 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
@@ -38,18 +37,31 @@ public class BussLibraryProduct8After implements TaskListener{
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
List<String> nextUserList = new ArrayList<>();
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
String approvalOpinion = form.get("approvalOpinion") == null ? "" : form.get("approvalOpinion").toString();
String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
@@ -63,20 +75,21 @@ public class BussLibraryProduct8After implements TaskListener{
if(StringUtils.isNotBlank(approvalOpinion)){
if ("0".equalsIgnoreCase(approvalOpinion)) {
if(StringUtils.isNotBlank(object.getString("bussUser10"))){
if(StringUtils.isNotBlank(roleForm.getString("bussUser10"))){
delegateTask.setVariable("auditUserThrough", (Integer) delegateTask.getVariable("auditUserThrough") + 1);
if (ObjectUtils.equals(delegateTask.getVariable("auditUserSize"),delegateTask.getVariable("auditUserThrough"))) {
if(object.getString("bussUser10").contains(",")){
nextUserList = Arrays.asList(object.getString("bussUser10").split(","));
if(roleForm.getString("bussUser10").contains(",")){
nextUserList = Arrays.asList(roleForm.getString("bussUser10").split(","));
}else {
nextUserList.add(object.getString("bussUser10"));
nextUserList.add(roleForm.getString("bussUser10"));
}
// 配置多实例
delegateTask.setVariable("bussUser10List",nextUserList);
delegateTask.addCandidateUsers(nextUserList);
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
String commentText = form.getString("commentText");
BussUtils.approvalFunc2(delegateTask, object, commentText, prcName, nextUserList);
delegateTask.setVariable("bussP8Flag", 0);
//设置下个审定节点操作人数量+通过人数量
@@ -90,7 +103,7 @@ public class BussLibraryProduct8After implements TaskListener{
}
} else {
delegateTask.setVariable("auditReject",1);
if(StringUtils.isNotBlank(object.getString("bussUser6"))) {
if(StringUtils.isNotBlank(roleForm.getString("bussUser6"))) {
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
@@ -98,12 +111,13 @@ public class BussLibraryProduct8After implements TaskListener{
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("bussUser6"));
busProcessNew.setUserId(roleForm.getString("bussUser6"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
delegateTask.setVariable("bussUserC6",object.getString("bussUser6"));
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/BussLibraryProduct8Before.java
+1 -8
View File
@@ -1,6 +1,5 @@
package com.ydw.bat.wkflow.listener.bussLibraryProduct;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
@@ -18,13 +17,7 @@ public class BussLibraryProduct8Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct9After.java
+32 -18
View File
@@ -8,7 +8,6 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
import com.ydw.bat.wkflow.listener.bussLibrary.BussUtils;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.delegate.DelegateTask;
@@ -36,18 +35,31 @@ public class BussLibraryProduct9After implements TaskListener{
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
List<String> nextUserList = new ArrayList<>();
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
String approvalOpinion = form.get("approvalOpinion") == null ? "" : form.get("approvalOpinion").toString();
String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
@@ -61,22 +73,23 @@ public class BussLibraryProduct9After implements TaskListener{
if(StringUtils.isNotBlank(approvalOpinion)){
if ("0".equalsIgnoreCase(approvalOpinion)) {
if(StringUtils.isNotBlank(object.getString("bussUser10"))){
if(StringUtils.isNotBlank(roleForm.getString("bussUser10"))){
if(object.getString("bussUser10").contains(",")){
nextUserList = Arrays.asList(object.getString("bussUser10").split(","));
if(roleForm.getString("bussUser10").contains(",")){
nextUserList = Arrays.asList(roleForm.getString("bussUser10").split(","));
}else {
nextUserList.add(object.getString("bussUser10"));
nextUserList.add(roleForm.getString("bussUser10"));
}
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
delegateTask.setVariable("bussUser10",object.getString("bussUser10"));
String commentText = form.getString("commentText");
BussUtils.approvalFunc2(delegateTask, object, commentText, prcName, nextUserList);
delegateTask.setVariable("bussUser10",roleForm.getString("bussUser10"));
delegateTask.setVariable("bussP9Flag", 0);
}else {
throw new ActivitiException("1#2总院产品工程经理/各事业部技术中心主任参数不存在,请配置相关用户");
}
} else {
if(StringUtils.isNotBlank(object.getString("bussUser6"))) {
if(StringUtils.isNotBlank(roleForm.getString("bussUser6"))) {
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
@@ -84,12 +97,13 @@ public class BussLibraryProduct9After implements TaskListener{
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("bussUser6"));
busProcessNew.setUserId(roleForm.getString("bussUser6"));
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
delegateTask.setVariable("bussUserC6",object.getString("bussUser6"));
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/BussLibraryProduct9Before.java
+1 -8
View File
@@ -1,6 +1,5 @@
package com.ydw.bat.wkflow.listener.bussLibraryProduct;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
@@ -18,13 +17,7 @@ public class BussLibraryProduct9Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC3After.java
+24 -11
View File
@@ -36,11 +36,24 @@ public class BussLibraryProductC3After implements TaskListener{
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
List<String> nextUserList = new ArrayList<>();
if(StringUtils.isNotBlank(object.getString("bussUser4"))){
delegateTask.setVariable("bussUser4",object.getString("bussUser4"));
nextUserList.add(object.getString("bussUser4"));
if(StringUtils.isNotBlank(roleForm.getString("bussUser4"))){
delegateTask.setVariable("bussUser4",roleForm.getString("bussUser4"));
nextUserList.add(roleForm.getString("bussUser4"));
}else {
throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
}
@@ -49,17 +62,17 @@ public class BussLibraryProductC3After implements TaskListener{
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
// form.getString("standName")
String standName = "";
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
@@ -78,7 +91,7 @@ public class BussLibraryProductC3After implements TaskListener{
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setCommitText(form.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC3Before.java
+1 -11
View File
@@ -1,9 +1,5 @@
package com.ydw.bat.wkflow.listener.bussLibraryProduct;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
@@ -21,13 +17,7 @@ public class BussLibraryProductC3Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC6After.java
+23 -10
View File
@@ -34,25 +34,38 @@ public class BussLibraryProductC6After implements TaskListener{
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
JSONObject form = null;
JSONObject roleForm = null;
if(object != null){
form = object.getJSONObject("form");
roleForm = object.getJSONObject("roleForm");
}
// 如果没有form和roleForm，就用object，用于兼容以前的数据
if(form == null){
form = object;
}
if(roleForm == null){
roleForm = object;
}
List<String> nextUserList = new ArrayList<>();
if(StringUtils.isNotBlank(object.getString("bussUser7"))){
delegateTask.setVariable("bussUser7",object.getString("bussUser7"));
nextUserList.add(object.getString("bussUser7"));
if(StringUtils.isNotBlank(roleForm.getString("bussUser7"))){
delegateTask.setVariable("bussUser7",roleForm.getString("bussUser7"));
nextUserList.add(roleForm.getString("bussUser7"));
}else {
throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
}
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
String user = roleForm.getString("prcCreateUser");
String username = roleForm.getString("prcCreateUserName");
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标制修订";
if(StringUtils.isNotBlank(form.getString("standName")) && StringUtils.isNotBlank(form.getString("standSort"))){
prcName = form.getString("standSort")+"-"+form.getString("standName") + "-企标制修订";
}else {
prcName = "企标制修订";
}
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 +84,7 @@ public class BussLibraryProductC6After implements TaskListener{
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setCommitText(form.getString("commentText"));
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProductC6Before.java
+1 -11
View File
@@ -1,9 +1,5 @@
package com.ydw.bat.wkflow.listener.bussLibraryProduct;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
@@ -21,13 +17,7 @@ public class BussLibraryProductC6Before implements TaskListener{
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
List<BusProcessNew> list = BussUtils.getNeedClaimTask(busBean, delegateTask);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussUtils.java
+91
View File
@@ -0,0 +1,91 @@
package com.ydw.bat.wkflow.listener.bussLibraryProduct;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessEvaluationHisService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
import com.ydw.bat.wkflow.util.SpringContextUtil;
import org.activiti.engine.delegate.DelegateTask;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/**
* @author wxyclub
* @description
* @date 2023/12/29
*/
public class BussUtils {
public static void evalSave(DelegateTask delegateTask, String evaluationData, String prcName, String localUser) {
SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
IBusProcessEvaluationHisService evaluationHisService = SpringContextUtil.getBean(IBusProcessEvaluationHisService.class);
BusProcessEvaluationHis evaluationHis = new BusProcessEvaluationHis();
evaluationHis.setPId(delegateTask.getProcessInstanceId());
evaluationHis.setMesg(evaluationData);
evaluationHis.setTaskInfo(delegateTask.getName());
evaluationHis.setUserId(localUser);
evaluationHis.setPrcName(prcName);
evaluationHis.setTaskId(delegateTask.getId());
evaluationHis.setCreateTime(sdf.format(new Date()));
evaluationHis.setUpdateTime(sdf.format(new Date()));
evaluationHisService.save(evaluationHis);
}
public static void approvalFunc2(DelegateTask delegateTask, JSONObject object,String commentText, String prcName, List<String> nextUserList) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
// 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(commentText);
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew);
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
}
public static void approvalFunc1(DelegateTask delegateTask, IBusProcessNewService busBean,String commentText,String commitFlag) {
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1);
if (one1 != null) {
one1.setTaskInfo(delegateTask.getName());
one1.setCommitFlag(commitFlag);
one1.setCommitText(commentText);
busBean.saveOrUpdate(one1);
}
}
public static List<BusProcessNew> getNeedClaimTask(IBusProcessNewService busBean , DelegateTask delegateTask) {
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
queryWrapper1.orderByDesc("CREATE_TIME");
return busBean.list(queryWrapper1);
}
}