feat: bug #52429 及 政策征求意见 填写驳回逻辑
This commit is contained in:
@@ -8,7 +8,9 @@ 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;
|
||||
@@ -57,27 +59,38 @@ public class DirectorAfter implements TaskListener {
|
||||
if(one1!=null){
|
||||
// one1.setOverTime(OVERTIME);
|
||||
one1.setPrcType("1");
|
||||
// one1.setPrcName(prcName);
|
||||
one1.setPrcName(prcName);
|
||||
one1.setCreatUser(user);
|
||||
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);
|
||||
if (object.getString("lawsProveChiefVerify")=="0"){
|
||||
func2(delegateTask, busBean, object, "0", busProcessNameService);
|
||||
}
|
||||
if(StringUtils.isNotBlank(object.getString("actionFlag"))){
|
||||
String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
|
||||
if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
|
||||
|
||||
BussUtils.endFunAll(delegateTask, prcName,busBean, object, "0", busProcessNameService,"laws2");
|
||||
delegateTask.setVariable("lawsProveChiefVerify",0);
|
||||
|
||||
} else {
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(object.toJSONString());
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busProcessNew.setUserId(lawsProveEngineerId2);
|
||||
busProcessNew.setPrcName(prcName);
|
||||
busBean.save(busProcessNew);
|
||||
|
||||
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
|
||||
delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineerId2);
|
||||
delegateTask.setVariable("lawsProveChiefVerify", 1);
|
||||
}
|
||||
}else {
|
||||
throw new ActivitiException("1#2 提交OR驳回参数不存在");
|
||||
}
|
||||
}
|
||||
|
||||
private String verifyObj(String str){
|
||||
|
||||
+2
-2
@@ -66,14 +66,14 @@ public class DistributionAfter implements TaskListener {
|
||||
String username = object.getString("prcCreateUserName");
|
||||
// object.getString("standName")
|
||||
String standName = "";
|
||||
String prcName = "政策征求意见流程-工程师填写意见";
|
||||
String prcName = "政策征求意见流程";
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
one1.setOverTime(OVERTIME);
|
||||
one1.setPrcType("laws2");
|
||||
// one1.setPrcName(prcName);
|
||||
one1.setPrcName(prcName);
|
||||
one1.setCreatUser(user);
|
||||
one1.setCreatUserName(username);
|
||||
busProcessNameService.saveOrUpdate(one1);
|
||||
|
||||
+39
-35
@@ -8,7 +8,9 @@ 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;
|
||||
@@ -36,18 +38,17 @@ public class DockerReviewAfter implements TaskListener {
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
if("0".equals(object.getString("actionFlag"))){
|
||||
String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
|
||||
if(StringUtils.isNotBlank(lawsProveEngineer)){
|
||||
delegateTask.setVariable("lawsProveEngineerId",lawsProveEngineer);
|
||||
delegateTask.setVariable("responseDockerVerify",0);
|
||||
|
||||
nextUserList= Arrays.asList(lawsProveEngineer.split(","));
|
||||
delegateTask.addCandidateUsers(nextUserList);
|
||||
}
|
||||
}else {
|
||||
delegateTask.setVariable("responseDockerVerify",1);
|
||||
}
|
||||
// if("0".equals(object.getString("actionFlag"))){
|
||||
// String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
|
||||
// if(StringUtils.isNotBlank(lawsProveEngineer)){
|
||||
// delegateTask.setVariable("lawsProveEngineerId",lawsProveEngineer);
|
||||
// delegateTask.setVariable("responseDockerVerify",0);
|
||||
//
|
||||
// nextUserList.add(object.getString("lawsProveEngineerId"));
|
||||
// }
|
||||
// }else {
|
||||
// delegateTask.setVariable("responseDockerVerify",1);
|
||||
// }
|
||||
|
||||
|
||||
//截止时间 流程描述 创建人
|
||||
@@ -63,37 +64,40 @@ public class DockerReviewAfter implements TaskListener {
|
||||
if(one1!=null){
|
||||
// one1.setOverTime(OVERTIME);
|
||||
one1.setPrcType("laws2");
|
||||
// one1.setPrcName(prcName);
|
||||
one1.setPrcName(prcName);
|
||||
one1.setCreatUser(user);
|
||||
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);
|
||||
if(StringUtils.isNotBlank(object.getString("actionFlag"))){
|
||||
String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
|
||||
String commentUser = JSONObject.parseObject(object.getString("form")).getString("commentUser");
|
||||
if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
|
||||
|
||||
if(nextUserList != null && !nextUserList.isEmpty()){
|
||||
for(String nextUser : nextUserList){
|
||||
delegateTask.setVariable("lawsProveEngineerId",lawsProveEngineer);
|
||||
nextUserList.add(lawsProveEngineer);
|
||||
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo("法规工程师修订征求意见");
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
delegateTask.setVariable("responseDockerVerify", 0);
|
||||
} else {
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(object.toJSONString());
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busProcessNew.setUserId(commentUser);
|
||||
busProcessNew.setPrcName(prcName);
|
||||
busBean.save(busProcessNew);
|
||||
|
||||
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
|
||||
delegateTask.setVariable("commentUser",commentUser);
|
||||
delegateTask.setVariable("responseDockerVerify", 1);
|
||||
}
|
||||
}else {
|
||||
throw new ActivitiException("1#2 提交OR驳回参数不存在");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+37
-38
@@ -9,7 +9,9 @@ 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;
|
||||
@@ -36,44 +38,20 @@ public class EngineerReviewAfter implements TaskListener {
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
|
||||
if ("0".equals( object.getString("actionFlag"))){
|
||||
JSONObject form = JSONObject.parseObject(object.getString("form"));
|
||||
String lawsProveEngineer = JSONObject.parseObject(form.getString("form")).getString("lawsProveEngineerId");
|
||||
if(StringUtils.isNotBlank(lawsProveEngineer)){
|
||||
|
||||
JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class);
|
||||
if (commentCollectionList==null) {
|
||||
commentCollectionList=new JSONArray();
|
||||
}
|
||||
commentCollectionList.addAll(object.getJSONArray("info"));
|
||||
delegateTask.setVariable("commentCollectionList",commentCollectionList);
|
||||
|
||||
|
||||
delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer);
|
||||
delegateTask.setVariable("lawsProveEngineerVerify",0);
|
||||
|
||||
|
||||
nextUserList= Arrays.asList(lawsProveEngineer.split(","));
|
||||
delegateTask.addCandidateUsers(nextUserList);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
//截止时间 流程描述 创建人
|
||||
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 standName = "";
|
||||
String prcName = "政策征求意见流程-法规工程师汇总修订";
|
||||
String prcName = "政策征求意见流程";
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
// one1.setOverTime(OVERTIME);
|
||||
one1.setPrcType("laws2");
|
||||
// one1.setPrcName(prcName);
|
||||
one1.setPrcName(prcName);
|
||||
one1.setCreatUser(user);
|
||||
one1.setCreatUserName(username);
|
||||
busProcessNameService.saveOrUpdate(one1);
|
||||
@@ -103,20 +81,41 @@ public class EngineerReviewAfter implements TaskListener {
|
||||
busBean.save(busProcessNew);
|
||||
}
|
||||
|
||||
if(StringUtils.isNotBlank(object.getString("actionFlag"))){
|
||||
String lawsProveEngineer = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
|
||||
String commentUser = JSONObject.parseObject(object.getString("form")).getString("commentUser");
|
||||
if ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
|
||||
|
||||
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);
|
||||
JSONArray commentCollectionList =delegateTask.getVariable("commentCollectionList", JSONArray.class);
|
||||
if (commentCollectionList==null) {
|
||||
commentCollectionList=new JSONArray();
|
||||
}
|
||||
commentCollectionList.addAll(object.getJSONArray("info"));
|
||||
delegateTask.setVariable("commentCollectionList",commentCollectionList);
|
||||
|
||||
delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineer);
|
||||
nextUserList.add(lawsProveEngineer);
|
||||
|
||||
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
delegateTask.setVariable("lawsProveEngineerVerify", 0);
|
||||
} else {
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(object.toJSONString());
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busProcessNew.setUserId(commentUser);
|
||||
busProcessNew.setPrcName(prcName);
|
||||
busBean.save(busProcessNew);
|
||||
|
||||
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
|
||||
delegateTask.setVariable("commentUser",commentUser);
|
||||
delegateTask.setVariable("lawsProveEngineerVerify", 1);
|
||||
}
|
||||
}else {
|
||||
throw new ActivitiException("1#2 提交OR驳回参数不存在");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -54,14 +54,14 @@ public class EngineerRevisionAfter implements TaskListener {
|
||||
String username = object.getString("prcCreateUserName");
|
||||
// object.getString("standName")
|
||||
String standName = "";
|
||||
String prcName = "政策征求意见流程-法规认证部长审核";
|
||||
String prcName = "政策征求意见流程";
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
// one1.setOverTime(OVERTIME);
|
||||
one1.setPrcType("laws2");
|
||||
// one1.setPrcName(prcName);
|
||||
one1.setPrcName(prcName);
|
||||
one1.setCreatUser(user);
|
||||
one1.setCreatUserName(username);
|
||||
busProcessNameService.saveOrUpdate(one1);
|
||||
|
||||
+3
-7
@@ -40,12 +40,8 @@ public class FillCommentAfter implements TaskListener {
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
List<String> nextUserList = new ArrayList();
|
||||
if(StringUtils.isNotBlank(responseDocker)){
|
||||
|
||||
|
||||
|
||||
delegateTask.setVariable("responseDockerId",responseDocker);
|
||||
nextUserList= Arrays.asList(responseDocker.split(","));
|
||||
delegateTask.addCandidateUsers(nextUserList);
|
||||
nextUserList.add(object.getString("responseDockerId"));
|
||||
}
|
||||
|
||||
|
||||
@@ -55,14 +51,14 @@ public class FillCommentAfter implements TaskListener {
|
||||
String username = object.getString("prcCreateUserName");
|
||||
// object.getString("standName")
|
||||
String standName = "";
|
||||
String prcName = "政策征求意见流程-责任对接人审核";
|
||||
String prcName = "政策征求意见流程";
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
// one1.setOverTime(OVERTIME);
|
||||
one1.setPrcType("laws2");
|
||||
// one1.setPrcName(prcName);
|
||||
one1.setPrcName(prcName);
|
||||
one1.setCreatUser(user);
|
||||
one1.setCreatUserName(username);
|
||||
busProcessNameService.saveOrUpdate(one1);
|
||||
|
||||
@@ -49,7 +49,7 @@ public class LaunchAfter implements TaskListener {
|
||||
String username = object.getString("prcCreateUserName");
|
||||
// object.getString("standName")
|
||||
String standName = "";
|
||||
String prcName = "政策征求意见流程-任务分发";
|
||||
String prcName = "政策征求意见流程";
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
|
||||
+32
-40
@@ -1,5 +1,6 @@
|
||||
package com.ydw.bat.wkflow.listener.policyCommentProcess;
|
||||
|
||||
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.BusProcessName;
|
||||
@@ -8,7 +9,9 @@ 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;
|
||||
@@ -37,65 +40,54 @@ public class MinisterReviewAfter implements TaskListener {
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
|
||||
if ("0".equals(object.getString("actionFlag"))){
|
||||
|
||||
JSONObject form = JSONObject.parseObject(object.getString("form"));
|
||||
String lawsProveViceChief = JSONObject.parseObject(form.getString("form")).getString("lawsProveViceChiefId");
|
||||
if(StringUtils.isNotBlank(lawsProveViceChief)){
|
||||
|
||||
delegateTask.setVariable("lawsProveMinisterVerify",0);
|
||||
delegateTask.setVariable("lawsProveViceChiefId",lawsProveViceChief);
|
||||
nextUserList= Arrays.asList(lawsProveViceChief.split(","));
|
||||
delegateTask.addCandidateUsers(nextUserList);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
//截止时间 流程描述 创建人
|
||||
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 standName = "";
|
||||
String prcName = "政策征求意见流程-法规认证副总监审核";
|
||||
String prcName = "政策征求意见流程";
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
// one1.setOverTime(OVERTIME);
|
||||
one1.setPrcType("laws2");
|
||||
// one1.setPrcName(prcName);
|
||||
one1.setPrcName(prcName);
|
||||
one1.setCreatUser(user);
|
||||
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);
|
||||
if(StringUtils.isNotBlank(object.getString("actionFlag"))){
|
||||
String lawsProveViceChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveViceChiefId");
|
||||
String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
|
||||
|
||||
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 ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
|
||||
|
||||
delegateTask.setVariable("lawsProveViceChiefId",lawsProveViceChief);
|
||||
nextUserList.add(lawsProveViceChief);
|
||||
|
||||
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
delegateTask.setVariable("lawsProveMinisterVerify", 0);
|
||||
} else {
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(object.toJSONString());
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busProcessNew.setUserId(lawsProveEngineerId2);
|
||||
busProcessNew.setPrcName(prcName);
|
||||
busBean.save(busProcessNew);
|
||||
|
||||
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
|
||||
delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineerId2);
|
||||
delegateTask.setVariable("lawsProveMinisterVerify", 1);
|
||||
}
|
||||
}else {
|
||||
throw new ActivitiException("1#2 提交OR驳回参数不存在");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+32
-40
@@ -8,7 +8,9 @@ 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;
|
||||
@@ -37,65 +39,55 @@ public class ViceDirectorAfter implements TaskListener {
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
|
||||
if ("0".equals(object.getString("actionFlag"))){
|
||||
|
||||
|
||||
JSONObject form = JSONObject.parseObject(object.getString("form"));
|
||||
String lawsProveChief = JSONObject.parseObject(form.getString("form")).getString("lawsProveChiefId");
|
||||
if(StringUtils.isNotBlank(lawsProveChief)){
|
||||
|
||||
delegateTask.setVariable("lawsProveViceChiefVerify",0);
|
||||
delegateTask.setVariable("lawsProveChiefId",lawsProveChief);
|
||||
nextUserList= Arrays.asList(lawsProveChief.split(","));
|
||||
delegateTask.addCandidateUsers(nextUserList);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//截止时间 流程描述 创建人
|
||||
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 standName = "";
|
||||
String prcName = "政策征求意见流程-法规认证总监审核";
|
||||
String prcName = "政策征求意见流程";
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
// one1.setOverTime(OVERTIME);
|
||||
one1.setPrcType("laws2");
|
||||
// one1.setPrcName(prcName);
|
||||
one1.setPrcName(prcName);
|
||||
one1.setCreatUser(user);
|
||||
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);
|
||||
if(StringUtils.isNotBlank(object.getString("actionFlag"))){
|
||||
String lawsProveChief = JSONObject.parseObject(object.getString("form")).getString("lawsProveChiefId");
|
||||
String lawsProveEngineerId2 = JSONObject.parseObject(object.getString("form")).getString("lawsProveEngineerId");
|
||||
|
||||
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 ("0".equalsIgnoreCase(object.getString("actionFlag"))) {
|
||||
|
||||
nextUserList.add(lawsProveChief);
|
||||
|
||||
delegateTask.setVariable("lawsProveChiefId",lawsProveChief);
|
||||
|
||||
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
|
||||
delegateTask.setVariable("lawsProveViceChiefVerify", 0);
|
||||
} else {
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNew.setMesg(object.toJSONString());
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busProcessNew.setUserId(lawsProveEngineerId2);
|
||||
busProcessNew.setPrcName(prcName);
|
||||
busBean.save(busProcessNew);
|
||||
|
||||
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
|
||||
delegateTask.setVariable("lawsProveEngineerId2",lawsProveEngineerId2);
|
||||
delegateTask.setVariable("lawsProveViceChiefVerify", 1);
|
||||
}
|
||||
}else {
|
||||
throw new ActivitiException("1#2 提交OR驳回参数不存在");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user