add: 企标制修订流程修改
This commit is contained in:
@@ -104,7 +104,7 @@ public class BLApplicantAfter implements TaskListener{
|
||||
// throw new ActivitiException("1#2其他起草人参数不存在,请配置相关用户");
|
||||
// }
|
||||
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
@@ -121,14 +121,14 @@ public class BLApplicantAfter implements TaskListener{
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(object.toJSONString());
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busBean.save(busProcessNew);
|
||||
|
||||
if(nextUserList != null && !nextUserList.isEmpty()){
|
||||
if(!nextUserList.isEmpty()){
|
||||
for(String nextUser : nextUserList){
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ydw.bat.wkflow.listener.bussLibrary;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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;
|
||||
@@ -93,7 +94,7 @@ public class BLApplicantC1After implements TaskListener{
|
||||
// throw new ActivitiException("1#2其他起草人参数不存在,请配置相关用户");
|
||||
// }
|
||||
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
@@ -106,18 +107,19 @@ public class BLApplicantC1After implements TaskListener{
|
||||
}
|
||||
|
||||
// 存储当前节点意见
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(object.toJSONString());
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
|
||||
queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if (list.isEmpty()) {
|
||||
throw new ActivitiException("流程实例不存在");
|
||||
}
|
||||
// 当前节点
|
||||
BusProcessNew busProcessNew = list.get(0);
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busBean.save(busProcessNew);
|
||||
busProcessNew.setTaskId(delegateTask.getName());
|
||||
busBean.saveOrUpdate(busProcessNew);
|
||||
|
||||
if(nextUserList != null && !nextUserList.isEmpty()){
|
||||
if(!nextUserList.isEmpty()){
|
||||
for(String nextUser : nextUserList){
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
|
||||
@@ -18,7 +18,7 @@ public class BLApplicantC1Before implements TaskListener{
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ydw.bat.wkflow.listener.bussLibrary;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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;
|
||||
@@ -34,7 +35,7 @@ public class BussLibrary10After implements TaskListener{
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
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");
|
||||
@@ -45,7 +46,7 @@ public class BussLibrary10After implements TaskListener{
|
||||
}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){
|
||||
@@ -64,7 +65,8 @@ public class BussLibrary10After implements TaskListener{
|
||||
delegateTask.setVariable("zhrUserId",object.getString("zhrUserId"));
|
||||
nextUserList.add(object.getString("zhrUserId"));
|
||||
|
||||
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
// BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
BussUtils.approvalFunc3(delegateTask, object, prcName, nextUserList);
|
||||
delegateTask.setVariable("fzrFlag", 0);
|
||||
}else {
|
||||
throw new ActivitiException("1#2副主任用户参数不存在,请配置相关用户");
|
||||
@@ -81,7 +83,7 @@ public class BussLibrary10After implements TaskListener{
|
||||
busProcessNew.setUserId(object.getString("xdUserId"));
|
||||
busProcessNew.setPrcName(prcName);
|
||||
busBean.save(busProcessNew);
|
||||
|
||||
busProcessNew.setCommitFlag("1");
|
||||
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
|
||||
delegateTask.setVariable("cxdUserId",object.getString("xdUserId"));
|
||||
delegateTask.setVariable("fzrFlag", 1);
|
||||
|
||||
@@ -18,7 +18,7 @@ public class BussLibrary10Before implements TaskListener{
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ydw.bat.wkflow.listener.bussLibrary;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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;
|
||||
@@ -34,7 +35,7 @@ public class BussLibrary11After implements TaskListener{
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
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");
|
||||
@@ -45,7 +46,7 @@ public class BussLibrary11After implements TaskListener{
|
||||
}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){
|
||||
@@ -64,13 +65,15 @@ public class BussLibrary11After implements TaskListener{
|
||||
delegateTask.setVariable("pxUserId",object.getString("pxUserId"));
|
||||
nextUserList.add(object.getString("pxUserId"));
|
||||
|
||||
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
// BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
BussUtils.approvalFunc3(delegateTask, object, prcName, nextUserList);
|
||||
delegateTask.setVariable("zrFlag", 0);
|
||||
}else {
|
||||
throw new ActivitiException("1#2主起草人用户参数不存在,请配置相关用户");
|
||||
}
|
||||
} else {
|
||||
if(StringUtils.isNotBlank(object.getString("xdUserId"))) {
|
||||
// 驳回节点数据
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
|
||||
@@ -18,7 +18,7 @@ public class BussLibrary11Before implements TaskListener{
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ydw.bat.wkflow.listener.bussLibrary;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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;
|
||||
@@ -34,7 +35,7 @@ public class BussLibrary12After implements TaskListener{
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
List<String> nextUserList = new ArrayList<>();
|
||||
|
||||
if(StringUtils.isNotBlank(object.getString("fbUserId"))){
|
||||
delegateTask.setVariable("fbUserId",object.getString("fbUserId"));
|
||||
@@ -52,7 +53,7 @@ public class BussLibrary12After implements TaskListener{
|
||||
}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){
|
||||
@@ -65,30 +66,29 @@ public class BussLibrary12After implements TaskListener{
|
||||
}
|
||||
|
||||
// 存储当前节点意见
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(object.toJSONString());
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
|
||||
queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if (list.isEmpty()) {
|
||||
throw new ActivitiException("流程实例不存在");
|
||||
}
|
||||
// 当前节点
|
||||
BusProcessNew busProcessNew = list.get(0);
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busBean.save(busProcessNew);
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busBean.saveOrUpdate(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.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
for(String nextUser : nextUserList){
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ public class BussLibrary12Before implements TaskListener{
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -18,7 +18,7 @@ public class BussLibrary13Before implements TaskListener{
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.bussLibrary;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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;
|
||||
@@ -38,7 +39,7 @@ public class BussLibrary2After implements TaskListener{
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
List<String> nextUserList = new ArrayList<>();
|
||||
|
||||
JSONArray fileList =delegateTask.getVariable("fileModelList", JSONArray.class);
|
||||
if (fileList==null) {
|
||||
@@ -69,7 +70,7 @@ public class BussLibrary2After implements TaskListener{
|
||||
}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){
|
||||
@@ -82,30 +83,29 @@ public class BussLibrary2After implements TaskListener{
|
||||
}
|
||||
|
||||
// 存储当前节点意见
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(object.toJSONString());
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
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.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
|
||||
queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew busProcessNew = list.get(0);
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
busBean.saveOrUpdate(busProcessNew);
|
||||
}
|
||||
|
||||
for(String nextUser : nextUserList){
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
// busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
// busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ public class BussLibrary2Before implements TaskListener{
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ydw.bat.wkflow.listener.bussLibrary;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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;
|
||||
@@ -36,7 +37,7 @@ public class BussLibrary3After implements TaskListener{
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
List<String> nextUserList = new ArrayList<>();
|
||||
|
||||
if(StringUtils.isNotBlank(object.getString("bzhUserId"))){
|
||||
delegateTask.setVariable("bzhUserId",object.getString("bzhUserId"));
|
||||
@@ -59,7 +60,7 @@ public class BussLibrary3After implements TaskListener{
|
||||
}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,32 +71,29 @@ public class BussLibrary3After implements TaskListener{
|
||||
one1.setCreatUserName(username);
|
||||
busProcessNameService.saveOrUpdate(one1);
|
||||
}
|
||||
|
||||
// 存储当前节点意见
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(object.toJSONString());
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busBean.save(busProcessNew);
|
||||
LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
|
||||
queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew busProcessNew = list.get(0);
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
busBean.saveOrUpdate(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.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
for(String nextUser : nextUserList){
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ public class BussLibrary3Before implements TaskListener{
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ydw.bat.wkflow.listener.bussLibrary;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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;
|
||||
@@ -19,7 +20,7 @@ import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 标准化员审批后
|
||||
* 初审,标准化员审批后
|
||||
*/
|
||||
public class BussLibrary4After implements TaskListener{
|
||||
@Override
|
||||
@@ -35,7 +36,7 @@ public class BussLibrary4After implements TaskListener{
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
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");
|
||||
@@ -46,7 +47,7 @@ public class BussLibrary4After implements TaskListener{
|
||||
}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){
|
||||
@@ -57,6 +58,14 @@ public class BussLibrary4After implements TaskListener{
|
||||
one1.setCreatUserName(username);
|
||||
busProcessNameService.saveOrUpdate(one1);
|
||||
}
|
||||
LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
|
||||
queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if (list.isEmpty()) {
|
||||
throw new ActivitiException("流程实例不存在");
|
||||
}
|
||||
BusProcessNew busProcessNew = list.get(0);
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
|
||||
if(StringUtils.isNotBlank(approvalOpinion)){
|
||||
if ("0".equalsIgnoreCase(approvalOpinion)) {
|
||||
@@ -68,7 +77,7 @@ public class BussLibrary4After implements TaskListener{
|
||||
nextUserList.add(object.getString("hqUserId"));
|
||||
}
|
||||
|
||||
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
// BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
// 配置多实例
|
||||
delegateTask.setVariable("hqUserList",nextUserList);
|
||||
delegateTask.addCandidateUsers(nextUserList);
|
||||
@@ -78,22 +87,39 @@ public class BussLibrary4After implements TaskListener{
|
||||
}
|
||||
} else {
|
||||
if(StringUtils.isNotBlank(object.getString("hzUserId"))) {
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(object.toJSONString());
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setUserId(object.getString("hzUserId"));
|
||||
busProcessNew.setPrcName(prcName);
|
||||
busBean.save(busProcessNew);
|
||||
// BusProcessNew busProcessNew = new BusProcessNew();
|
||||
// busProcessNew.setMsgType("clause");
|
||||
// busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
// busProcessNew.setMesg(object.toJSONString());
|
||||
// busProcessNew.setFinishFlag("0");
|
||||
// busProcessNew.setUserId(object.getString("hzUserId"));
|
||||
// busProcessNew.setPrcName(prcName);
|
||||
// busBean.save(busProcessNew);
|
||||
busProcessNew.setFinishFlag("1");
|
||||
|
||||
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
|
||||
// BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
|
||||
nextUserList.add(object.getString("hzUserId"));
|
||||
delegateTask.setVariable("chzUserId",object.getString("hzUserId"));
|
||||
delegateTask.setVariable("bzhFlag", 1);
|
||||
}else {
|
||||
throw new ActivitiException("1#2汇总用户参数不存在,请配置相关用户");
|
||||
}
|
||||
}
|
||||
|
||||
// 存储当前节点意见
|
||||
busBean.saveOrUpdate(busProcessNew);
|
||||
// 存储下一节点意见
|
||||
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);
|
||||
}
|
||||
}else {
|
||||
throw new ActivitiException("1#2 提交OR驳回参数不存在");
|
||||
}
|
||||
|
||||
@@ -11,14 +11,14 @@ import org.activiti.engine.delegate.TaskListener;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 标准化员审批前
|
||||
* 初审,标准化员审批前
|
||||
*/
|
||||
public class BussLibrary4Before implements TaskListener{
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.bussLibrary;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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;
|
||||
@@ -42,7 +43,7 @@ public class BussLibrary5After implements TaskListener{
|
||||
JSONObject object = JSONObject.parseObject(datasList.get(0).getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
List<String> nextUserList = new ArrayList<>();
|
||||
|
||||
JSONArray ideaList =delegateTask.getVariable("ideaList", JSONArray.class);
|
||||
if (ideaList==null) {
|
||||
@@ -68,7 +69,7 @@ public class BussLibrary5After implements TaskListener{
|
||||
}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){
|
||||
@@ -81,33 +82,42 @@ public class BussLibrary5After implements TaskListener{
|
||||
}
|
||||
|
||||
// 存储当前节点意见
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(object.toJSONString());
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busBean.save(busProcessNew);
|
||||
LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
|
||||
queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew busProcessNew = list.get(0);
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
busBean.saveOrUpdate(busProcessNew);
|
||||
}
|
||||
// 存储当前节点意见
|
||||
// BusProcessNew busProcessNew = new BusProcessNew();
|
||||
// busProcessNew.setMsgType("clause");
|
||||
// busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
// busProcessNew.setMesg(object.toJSONString());
|
||||
// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
// busProcessNew.setTaskId(delegateTask.getId());
|
||||
// busProcessNew.setCommitText(object.getString("commentText"));
|
||||
// busProcessNew.setFinishFlag("0");
|
||||
// busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
// busBean.save(busProcessNew);
|
||||
|
||||
// 评分存储
|
||||
BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
|
||||
|
||||
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.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
for(String nextUser : nextUserList){
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ public class BussLibrary5Before implements TaskListener{
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ydw.bat.wkflow.listener.bussLibrary;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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;
|
||||
@@ -34,7 +35,7 @@ public class BussLibrary6After implements TaskListener{
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
List<String> nextUserList = new ArrayList<>();
|
||||
|
||||
if(StringUtils.isNotBlank(object.getString("fggcsUserId"))){
|
||||
delegateTask.setVariable("fggcsUserId",object.getString("fggcsUserId"));
|
||||
@@ -52,7 +53,7 @@ public class BussLibrary6After implements TaskListener{
|
||||
}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){
|
||||
@@ -65,33 +66,42 @@ public class BussLibrary6After implements TaskListener{
|
||||
}
|
||||
|
||||
// 存储当前节点意见
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(object.toJSONString());
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
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.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
// 评分存储
|
||||
BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
|
||||
// BusProcessNew busProcessNew = new BusProcessNew();
|
||||
// busProcessNew.setMsgType("clause");
|
||||
// busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
// busProcessNew.setMesg(object.toJSONString());
|
||||
// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
// busProcessNew.setTaskId(delegateTask.getId());
|
||||
// busProcessNew.setCommitText(object.getString("commentText"));
|
||||
// busProcessNew.setFinishFlag("0");
|
||||
// busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
// busBean.save(busProcessNew);
|
||||
// 存储当前节点意见
|
||||
LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
|
||||
queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew busProcessNew = list.get(0);
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
busBean.saveOrUpdate(busProcessNew);
|
||||
}
|
||||
|
||||
for(String nextUser : nextUserList){
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
// 评分存储
|
||||
BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
|
||||
}
|
||||
|
||||
private String verifyObj(String str){
|
||||
|
||||
@@ -21,7 +21,7 @@ public class BussLibrary6Before implements TaskListener{
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.listener.bussLibrary;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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;
|
||||
@@ -42,7 +43,7 @@ public class BussLibrary7After implements TaskListener{
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
List<String> nextUserList = new ArrayList<>();
|
||||
|
||||
//截止时间 流程描述 创建人
|
||||
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
|
||||
@@ -54,7 +55,7 @@ public class BussLibrary7After implements TaskListener{
|
||||
}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){
|
||||
@@ -66,24 +67,34 @@ public class BussLibrary7After implements TaskListener{
|
||||
busProcessNameService.saveOrUpdate(one1);
|
||||
}
|
||||
|
||||
// 评分存储
|
||||
if(StringUtils.isBlank(object.getString("fsRejectStatus")) || object.getString("fsRejectStatus").equalsIgnoreCase("2")){
|
||||
BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotBlank(approvalOpinion)){
|
||||
// 通过
|
||||
if ("0".equalsIgnoreCase(approvalOpinion)) {
|
||||
if(StringUtils.isNotBlank(object.getString("jsfzrUserId"))){
|
||||
|
||||
delegateTask.setVariable("jsfzrUserId",object.getString("jsfzrUserId"));
|
||||
nextUserList.add(object.getString("jsfzrUserId"));
|
||||
|
||||
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
// 评分存储
|
||||
if(StringUtils.isBlank(object.getString("fsRejectStatus")) || object.getString("fsRejectStatus").equalsIgnoreCase("2")){
|
||||
BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
|
||||
}
|
||||
// BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
// // 评分存储
|
||||
// if(StringUtils.isBlank(object.getString("fsRejectStatus")) || object.getString("fsRejectStatus").equalsIgnoreCase("2")){
|
||||
// BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
|
||||
// }
|
||||
|
||||
// 存储当前节点意见
|
||||
BussUtils.approvalFunc3(delegateTask, object, prcName, nextUserList);
|
||||
|
||||
delegateTask.setVariable("fs7Flag", 0);
|
||||
}else {
|
||||
throw new ActivitiException("1#2部长用户参数不存在,请配置相关用户");
|
||||
}
|
||||
} else {
|
||||
// 驳回
|
||||
if(StringUtils.isNotBlank(object.getString("xdUserId"))) {
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
@@ -108,34 +119,36 @@ public class BussLibrary7After implements TaskListener{
|
||||
}
|
||||
|
||||
// 存储当前节点意见
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(object.toJSONString());
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busBean.save(busProcessNew);
|
||||
// BusProcessNew busProcessNew = new BusProcessNew();
|
||||
// busProcessNew.setMsgType("clause");
|
||||
// busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
// busProcessNew.setMesg(object.toJSONString());
|
||||
// busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
// busProcessNew.setTaskId(delegateTask.getId());
|
||||
// busProcessNew.setCommitText(object.getString("commentText"));
|
||||
// busProcessNew.setFinishFlag("0");
|
||||
// busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
// busBean.save(busProcessNew);
|
||||
|
||||
// 存储当前节点意见
|
||||
// busBean.saveOrUpdate(busProcessNew);
|
||||
// 评分存储
|
||||
BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
|
||||
// BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
|
||||
|
||||
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.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
// 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.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
// busProcessNewNext.setFinishFlag("0");
|
||||
// busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
// busProcessNewNext.setUserId(nextUser);
|
||||
// busProcessNewNext.setPrcName(prcName);
|
||||
// busBean.save(busProcessNewNext);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
private String verifyObj(String str){
|
||||
|
||||
@@ -18,7 +18,7 @@ public class BussLibrary7Before implements TaskListener{
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ydw.bat.wkflow.listener.bussLibrary;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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;
|
||||
@@ -34,7 +35,7 @@ public class BussLibrary8After implements TaskListener{
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
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");
|
||||
@@ -45,7 +46,8 @@ public class BussLibrary8After implements TaskListener{
|
||||
}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){
|
||||
@@ -64,7 +66,8 @@ public class BussLibrary8After implements TaskListener{
|
||||
delegateTask.setVariable("bzUserId",object.getString("bzUserId"));
|
||||
nextUserList.add(object.getString("bzUserId"));
|
||||
|
||||
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
// BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
BussUtils.approvalFunc3(delegateTask, object, prcName, nextUserList);
|
||||
delegateTask.setVariable("jsfzrFlag", 0);
|
||||
}else {
|
||||
throw new ActivitiException("1#2部长用户参数不存在,请配置相关用户");
|
||||
|
||||
@@ -18,7 +18,7 @@ public class BussLibrary8Before implements TaskListener{
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ydw.bat.wkflow.listener.bussLibrary;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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;
|
||||
@@ -34,7 +35,7 @@ public class BussLibrary9After implements TaskListener{
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
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");
|
||||
@@ -45,7 +46,7 @@ public class BussLibrary9After implements TaskListener{
|
||||
}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){
|
||||
@@ -64,8 +65,31 @@ public class BussLibrary9After implements TaskListener{
|
||||
delegateTask.setVariable("fzrUserId",object.getString("fzrUserId"));
|
||||
nextUserList.add(object.getString("fzrUserId"));
|
||||
|
||||
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
// BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
|
||||
LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
|
||||
queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if (list.isEmpty()) {
|
||||
throw new ActivitiException("流程实例不存在");
|
||||
}
|
||||
// 当前节点
|
||||
BusProcessNew busProcessNew = list.get(0);
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
busProcessNew.setTaskId(delegateTask.getName());
|
||||
busBean.saveOrUpdate(busProcessNew);
|
||||
// 下一个节点
|
||||
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);
|
||||
}
|
||||
// 评分存储
|
||||
if(StringUtils.isBlank(object.getString("fsRejectStatus")) || object.getString("fsRejectStatus").equalsIgnoreCase("2")){
|
||||
BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee());
|
||||
|
||||
@@ -18,7 +18,7 @@ public class BussLibrary9Before implements TaskListener{
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ydw.bat.wkflow.listener.bussLibrary;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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;
|
||||
@@ -20,9 +21,9 @@ import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 重新企标汇总修订后
|
||||
* 重新企标汇总修订后
|
||||
*/
|
||||
public class BussLibraryC3After implements TaskListener{
|
||||
public class BussLibraryC3After implements TaskListener {
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
||||
@@ -33,81 +34,75 @@ public class BussLibraryC3After implements TaskListener{
|
||||
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
|
||||
Datas datas = datasService.getOne(queryWrapper);
|
||||
|
||||
JSONObject objectNew = JSONObject.parseObject(datas.getFormValsJson());
|
||||
JSONObject objectNew = JSONObject.parseObject(datas.getFormValsJson());
|
||||
// delegateTask.setVariable("objectJson",object);
|
||||
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.eq("TASK_ID",delegateTask.getId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew one = list.get(0);
|
||||
List<String> nextUserList = new ArrayList();
|
||||
// QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
// queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
// queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
// queryWrapper1.eq("TASK_ID",delegateTask.getId());
|
||||
// List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
// BusProcessNew one = list.get(0);
|
||||
List<String> nextUserList = new ArrayList<>();
|
||||
|
||||
if(StringUtils.isNotBlank(objectNew.getString("bzhUserId"))){
|
||||
delegateTask.setVariable("bzhUserId",objectNew.getString("bzhUserId"));
|
||||
nextUserList.add(objectNew.getString("bzhUserId"));
|
||||
}else {
|
||||
throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
|
||||
}
|
||||
if (StringUtils.isNotBlank(objectNew.getString("bzhUserId"))) {
|
||||
delegateTask.setVariable("bzhUserId", objectNew.getString("bzhUserId"));
|
||||
nextUserList.add(objectNew.getString("bzhUserId"));
|
||||
} else {
|
||||
throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
|
||||
}
|
||||
|
||||
|
||||
|
||||
//截止时间 流程描述 创建人
|
||||
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
|
||||
String user = objectNew.getString("prcCreateUser");
|
||||
String username = objectNew.getString("prcCreateUserName");
|
||||
//截止时间 流程描述 创建人
|
||||
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
|
||||
String user = objectNew.getString("prcCreateUser");
|
||||
String username = objectNew.getString("prcCreateUserName");
|
||||
// object.getString("standName")
|
||||
String standName = "";
|
||||
String prcName = "";
|
||||
if(StringUtils.isNotBlank(objectNew.getString("standName")) && StringUtils.isNotBlank(objectNew.getString("standSort"))){
|
||||
prcName = objectNew.getString("standSort")+"-"+objectNew.getString("standName") + "-企标制修订";
|
||||
}else {
|
||||
prcName = "企标制修订";
|
||||
}
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
String standName = "";
|
||||
String prcName = "";
|
||||
if (StringUtils.isNotBlank(objectNew.getString("standName")) && StringUtils.isNotBlank(objectNew.getString("standSort"))) {
|
||||
prcName = objectNew.getString("standSort") + "-" + objectNew.getString("standName") + "-企标制修订";
|
||||
} else {
|
||||
prcName = "企标制修订";
|
||||
}
|
||||
QueryWrapper<BusProcessName> queryWrapper2 = new QueryWrapper<>();
|
||||
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if (one1 != null) {
|
||||
// one1.setOverTime(OVERTIME);
|
||||
one1.setPrcType("buss1");
|
||||
one1.setPrcName(prcName);
|
||||
one1.setCreatUser(user);
|
||||
one1.setCreatUserName(username);
|
||||
busProcessNameService.saveOrUpdate(one1);
|
||||
}
|
||||
one1.setPrcType("buss1");
|
||||
one1.setPrcName(prcName);
|
||||
one1.setCreatUser(user);
|
||||
one1.setCreatUserName(username);
|
||||
busProcessNameService.saveOrUpdate(one1);
|
||||
}
|
||||
|
||||
// 存储当前节点意见
|
||||
// 存储当前节点意见
|
||||
LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
|
||||
queryWrapper1.eq(BusProcessNew::getTaskId, delegateTask.getId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if (list.isEmpty()) {
|
||||
throw new ActivitiException("流程实例不存在");
|
||||
}
|
||||
// 当前节点
|
||||
BusProcessNew busProcessNew = list.get(0);
|
||||
busProcessNew.setCommitText(objectNew.getString("commentText"));
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busBean.saveOrUpdate(busProcessNew);
|
||||
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setId(one.getId());
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(objectNew.toJSONString());
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(objectNew.getString("commentText"));
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busBean.saveOrUpdate(busProcessNew);
|
||||
|
||||
if(nextUserList != null && !nextUserList.isEmpty()){
|
||||
for(String nextUser : nextUserList){
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(objectNew.toJSONString());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
for (String nextUser : nextUserList) {
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(objectNew.toJSONString());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
|
||||
private String verifyObj(String str){
|
||||
private String verifyObj(String str) {
|
||||
return (str == null || str.equals("")) ? "" : str;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ public class BussLibraryC3Before implements TaskListener{
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -36,14 +36,14 @@ public class BussLibraryC6After implements TaskListener{
|
||||
JSONObject objectNew = JSONObject.parseObject(datas.getFormValsJson());
|
||||
// delegateTask.setVariable("objectJson",object);
|
||||
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.eq("TASK_ID",delegateTask.getId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew one = list.get(0);
|
||||
List<String> nextUserList = new ArrayList();
|
||||
List<String> nextUserList = new ArrayList<>();
|
||||
|
||||
if(StringUtils.isNotBlank(objectNew.getString("fggcsUserId"))){
|
||||
delegateTask.setVariable("fggcsUserId",objectNew.getString("fggcsUserId"));
|
||||
@@ -66,7 +66,7 @@ public class BussLibraryC6After implements TaskListener{
|
||||
}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){
|
||||
@@ -79,33 +79,33 @@ public class BussLibraryC6After implements TaskListener{
|
||||
}
|
||||
|
||||
// 存储当前节点意见
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setId(one.getId());
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(objectNew.toJSONString());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(objectNew.getString("commentText"));
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busBean.saveOrUpdate(busProcessNew);
|
||||
// BusProcessNew busProcessNew = new BusProcessNew();
|
||||
// busProcessNew.setId(one.getId());
|
||||
// busProcessNew.setMsgType("clause");
|
||||
// busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
// busProcessNew.setMesg(objectNew.toJSONString());
|
||||
// busProcessNew.setTaskId(delegateTask.getId());
|
||||
// busProcessNew.setCommitText(objectNew.getString("commentText"));
|
||||
// busProcessNew.setFinishFlag("0");
|
||||
// busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
one.setCommitText(objectNew.getString("commentText"));
|
||||
one.setMesg(objectNew.toJSONString());
|
||||
busBean.saveOrUpdate(one);
|
||||
|
||||
if(nextUserList != null && !nextUserList.isEmpty()){
|
||||
for(String nextUser : nextUserList){
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(objectNew.toJSONString());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
// 评分存储
|
||||
if(StringUtils.isBlank(objectNew.getString("fsRejectStatus")) || objectNew.getString("fsRejectStatus").equalsIgnoreCase("2")) {
|
||||
BussUtils.evalSave(delegateTask, objectNew, prcName, delegateTask.getAssignee());
|
||||
}
|
||||
for(String nextUser : nextUserList){
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(objectNew.toJSONString());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
// 评分存储
|
||||
if(StringUtils.isBlank(objectNew.getString("fsRejectStatus")) || objectNew.getString("fsRejectStatus").equalsIgnoreCase("2")) {
|
||||
BussUtils.evalSave(delegateTask, objectNew, prcName, delegateTask.getAssignee());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ public class BussLibraryC6Before implements TaskListener{
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
QueryWrapper<BusProcessNew> queryWrapper1 = new QueryWrapper<>();
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ydw.bat.wkflow.listener.bussLibrary;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
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;
|
||||
@@ -9,6 +10,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessEvaluationHisSe
|
||||
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.util.SpringContextUtil;
|
||||
import org.activiti.engine.ActivitiException;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
@@ -165,4 +167,38 @@ public class BussUtils {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static void approvalFunc3(DelegateTask delegateTask, JSONObject object, String prcName, List<String> nextUserList) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
|
||||
// 存储当前节点意见
|
||||
LambdaQueryWrapper<BusProcessNew> queryWrapper1 = new LambdaQueryWrapper<>();
|
||||
queryWrapper1.eq(BusProcessNew::getTaskId,delegateTask.getId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if (list.isEmpty()) {
|
||||
throw new ActivitiException("流程实例不存在");
|
||||
}
|
||||
// 当前节点
|
||||
BusProcessNew busProcessNew = list.get(0);
|
||||
busProcessNew.setCommitText(object.getString("commentText"));
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busBean.saveOrUpdate(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);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user