Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
super_liu
@@ -160,6 +160,8 @@ public interface LawsUserInfoService {
|
||||
public ResponseMessage<Object> updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO);
|
||||
|
||||
|
||||
@PostMapping("/sarStandUnqualified/sar-stand-unqualified/updateBatch")
|
||||
public ResponseMessage<Object> updateBatch(@RequestBody List<SarStandUnqualified> sarStandUnqualified);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -31,8 +31,8 @@ public class PCAdataList {
|
||||
private String kccvppsbm;
|
||||
private String kccvppscn;
|
||||
private String standName;
|
||||
private String xcxssrqgj;
|
||||
private String zccssrqgj;
|
||||
private String xcxssrq;
|
||||
private String zccssrq;
|
||||
private String standEnName;
|
||||
private String liablePeople;
|
||||
private String liablePeopleId;
|
||||
|
||||
+13
-1
@@ -3,6 +3,8 @@ package com.ydw.bat.wkflow.listener.NonConformanceRectification;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.dto.SarStandUnqualified;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
|
||||
@@ -25,6 +27,7 @@ public class DockingApprovalAfter implements TaskListener {
|
||||
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
|
||||
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
|
||||
|
||||
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
|
||||
@@ -88,7 +91,16 @@ public class DockingApprovalAfter implements TaskListener {
|
||||
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
|
||||
|
||||
if(count>=responUserList.size()){
|
||||
|
||||
//入库 联动1？
|
||||
List<SarStandUnqualified> sarStandUnqualifieds=new ArrayList<>();
|
||||
for (Object j:object.getJSONObject("info").getJSONArray("fileDataList")) {
|
||||
JSONObject object1=JSONObject.parseObject(j.toString());
|
||||
SarStandUnqualified sarStandUnqualified=new SarStandUnqualified();
|
||||
sarStandUnqualified.setId(object1.getString("id"));
|
||||
sarStandUnqualified.setCloseState(2);
|
||||
sarStandUnqualifieds.add(sarStandUnqualified);
|
||||
}
|
||||
lawsUserInfoService.updateBatch(sarStandUnqualifieds);
|
||||
}
|
||||
|
||||
}else{
|
||||
|
||||
+2
-2
@@ -131,7 +131,7 @@ public class PCAdlApproveAfter implements TaskListener {
|
||||
|
||||
//遍历条目
|
||||
for (PCAchildren pcAchildren : pcAdataList.getChildren()) {
|
||||
if (null != pcAchildren.getNoCompliance() && !"".equals(pcAdataList.getNoCompliance())) {
|
||||
if (null != pcAchildren.getNoCompliance() && !"".equals(pcAchildren.getNoCompliance())) {
|
||||
SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
|
||||
//少一个standId 不合格原因 在研在产！
|
||||
sarStandUnqualified.setStandId(pcAchildren.getStandId());
|
||||
@@ -152,7 +152,7 @@ public class PCAdlApproveAfter implements TaskListener {
|
||||
standUnqualifieds.add(sarStandUnqualified);
|
||||
}
|
||||
|
||||
if (null != pcAdataList.getZcNoCompliance() && !"".equals(pcAdataList.getZcNoCompliance())) {
|
||||
if (null != pcAdataList.getZcNoCompliance() && !"".equals(pcAchildren.getZcNoCompliance())) {
|
||||
SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
|
||||
//少一个standId 不合格原因 在研在产！
|
||||
sarStandUnqualified.setStandId(pcAchildren.getStandId());
|
||||
|
||||
@@ -67,7 +67,7 @@ public class RAApproveAfter implements TaskListener {
|
||||
if (one2 != null) {
|
||||
// one2.setPrcName("入库流程结束");
|
||||
one2.setOverTime(OVERTIME);
|
||||
one2.setPrcType("1");
|
||||
one2.setPrcType("16");
|
||||
busProcessNameService.saveOrUpdate(one2);
|
||||
}
|
||||
|
||||
|
||||
+148
@@ -0,0 +1,148 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
|
||||
import com.ydw.bat.wkflow.business_slrs.dao.SarPublicIdea;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import com.ydw.bat.wkflow.util.http.ResponseMessage;
|
||||
import org.activiti.engine.ActivitiException;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
|
||||
//新征求意见流程!!!!!
|
||||
public class StartSurveyAfter implements TaskListener {
|
||||
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
|
||||
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
|
||||
|
||||
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
|
||||
Datas datas = datasService.getOne(queryWrapper);
|
||||
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
//整备数据
|
||||
//责任部门对接人集合==》
|
||||
if (object.getString("dockUserList").contains(",")){
|
||||
nextUserList.addAll(new ArrayList<>(Arrays.asList(object.getString("dockUserList").split(","))));
|
||||
}else {
|
||||
nextUserList.add(object.getString("dockUserList"));
|
||||
}
|
||||
delegateTask.setVariable("zrUserIdList",nextUserList);
|
||||
//存标准法规部部长id
|
||||
delegateTask.setVariable("bzLeaderId",object.getString("ministerUser"));
|
||||
//技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定
|
||||
delegateTask.setVariable("directorUser",object.getString("directorUser"));
|
||||
//工程总院院长
|
||||
delegateTask.setVariable("gcLeaderFirst",object.getString("presidentUser"));
|
||||
|
||||
//为新生成的公开征求意见建立id
|
||||
String uniques= String.valueOf(UUID.randomUUID());
|
||||
object.put("uniques",uniques);
|
||||
delegateTask.setVariable("uniqueMark",uniques);
|
||||
//截止时间 流程描述 创建人
|
||||
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
|
||||
String user = object.getString("startUser");
|
||||
String username = object.getString("startUserName");
|
||||
String standName = object.getString("cid");
|
||||
delegateTask.setVariable("userName",username);
|
||||
delegateTask.setVariable("user",user);
|
||||
delegateTask.setVariable("cid",standName);
|
||||
String prcName = standName+"-标准征求意见流程-责任部门对接人选择责任人";
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
one1.setPrcType("3");
|
||||
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.setUserId(delegateTask.getAssignee());
|
||||
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);
|
||||
}
|
||||
}else{
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo("责任对接人选择责任人");
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class));
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
Date time=new Date();
|
||||
String dateTime=object.getString("endTime");
|
||||
dateTime = dateTime.replace("Z", " UTC");
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS Z");
|
||||
SimpleDateFormat defaultFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
try {
|
||||
time= format.parse(dateTime);
|
||||
String result = defaultFormat.format(time);
|
||||
System.out.println(result);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
//发起公开征求意见
|
||||
SarPublicIdea sarPublicIdea = SarPublicIdea.builder()
|
||||
.id(UUID.randomUUID().toString())
|
||||
.category("标准")
|
||||
.cid(object.getString("cid"))
|
||||
.cname(object.getString("cname"))
|
||||
.startTime(new Date())
|
||||
.endTime(time)
|
||||
.standType(object.getString("standType"))
|
||||
.standId(object.getString("standId"))
|
||||
.uniques(uniques)
|
||||
.files(object.getString("filesId"))
|
||||
.filesName(object.getString("filesName"))
|
||||
.build();
|
||||
ResponseMessage result = lawsUserInfoService.addSarPublicIdea(sarPublicIdea);
|
||||
if(!result.isOk()){
|
||||
throw new ActivitiException("发起公开征求意见失败");
|
||||
}
|
||||
}
|
||||
}
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class StartSurveyBefore implements TaskListener {
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
// IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
// QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
// queryWrapper1.isNull("TASK_ID");
|
||||
// queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
// List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
// if(!list.isEmpty()){
|
||||
// BusProcessNew one1 = list.get(0);
|
||||
// one1.setTaskId(delegateTask.getId());
|
||||
// one1.setTaskInfo(delegateTask.getName());
|
||||
// busBean.saveOrUpdate(one1);
|
||||
// }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,109 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
//新征求意见流程!!!!!
|
||||
public class Step10After implements TaskListener {
|
||||
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
|
||||
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
|
||||
|
||||
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
|
||||
Datas datas = datasService.getOne(queryWrapper);
|
||||
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
|
||||
String prcName ="";
|
||||
if ("0".equals(object.getString("presidentFlag"))){
|
||||
delegateTask.setVariable("presidentFlag","0");
|
||||
prcName=delegateTask.getVariable("cid")+"-标准征求意见流程-流程结束";
|
||||
}else {
|
||||
delegateTask.setVariable("presidentFlag","1");
|
||||
nextUserList.add(delegateTask.getVariable("bzfgIdSum",String.class));
|
||||
prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总";
|
||||
}
|
||||
nextUserList.add(object.getString("presidentUser"));
|
||||
delegateTask.setVariable("presidentUser",object.getString("presidentUser"));
|
||||
|
||||
//截止时间 流程描述 创建人
|
||||
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
|
||||
String user = delegateTask.getVariable("user",String.class);
|
||||
String username = delegateTask.getVariable("userName",String.class);
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
if ("0".equals(object.getString("presidentFlag"))){
|
||||
one1.setOverTime(OVERTIME);
|
||||
}
|
||||
one1.setPrcType("3");
|
||||
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.setUserId(delegateTask.getAssignee());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.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(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}else {
|
||||
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.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Step10Before implements TaskListener {
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew one1 = list.get(0);
|
||||
one1.setTaskId(delegateTask.getId());
|
||||
one1.setTaskInfo(delegateTask.getName());
|
||||
busBean.saveOrUpdate(one1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,115 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
|
||||
import com.ydw.bat.wkflow.business_slrs.dao.SarPublicIdea;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import com.ydw.bat.wkflow.util.http.ResponseMessage;
|
||||
import org.activiti.engine.ActivitiException;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
|
||||
//新征求意见流程!!!!!
|
||||
public class Step1After implements TaskListener {
|
||||
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
|
||||
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
|
||||
|
||||
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
|
||||
Datas datas = datasService.getOne(queryWrapper);
|
||||
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
//整备数据
|
||||
if (object.getString("responUserList").contains(",")){
|
||||
nextUserList.addAll(new ArrayList<>(Arrays.asList(object.getString("responUserList").split(","))));
|
||||
}else {
|
||||
nextUserList.add(object.getString("responUserList"));
|
||||
}
|
||||
delegateTask.setVariable("zrIdList",nextUserList);
|
||||
if (null==delegateTask.getVariable("zrList")){
|
||||
delegateTask.setVariable("zrList",nextUserList);
|
||||
}else {
|
||||
List<String> strings=delegateTask.getVariable("zrList",List.class);
|
||||
List<String> middle=new ArrayList<>();
|
||||
nextUserList.forEach(s -> {
|
||||
if (!strings.contains(s)){
|
||||
middle.add(s);
|
||||
}
|
||||
});
|
||||
strings.addAll(middle);
|
||||
delegateTask.setVariable("zrList",strings);
|
||||
}
|
||||
//截止时间 流程描述 创建人
|
||||
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
|
||||
String user = delegateTask.getVariable("user",String.class);
|
||||
String username = delegateTask.getVariable("userName",String.class);
|
||||
String prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任人反馈";
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
one1.setPrcType("3");
|
||||
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.setUserId(delegateTask.getAssignee());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.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(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}else{
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo("责任对接人选择责任人");
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class));
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Step1Before implements TaskListener {
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew one1 = list.get(0);
|
||||
one1.setTaskId(delegateTask.getId());
|
||||
one1.setTaskInfo(delegateTask.getName());
|
||||
busBean.saveOrUpdate(one1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.ActivitiException;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
|
||||
//新征求意见流程!!!!!
|
||||
public class Step2After implements TaskListener {
|
||||
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
|
||||
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
|
||||
|
||||
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
|
||||
Datas datas = datasService.getOne(queryWrapper);
|
||||
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
//整备数据
|
||||
if (null==delegateTask.getVariable("count")){
|
||||
delegateTask.setVariable("count",1);
|
||||
}else {
|
||||
delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)+1);
|
||||
}
|
||||
|
||||
if (delegateTask.getVariable("count",Integer.class) == delegateTask.getVariable("zrIdList",List.class).size()){
|
||||
//对数据进行合并归属
|
||||
QueryWrapper<BusProcessNew> wrapper=new QueryWrapper<>();
|
||||
wrapper.eq("TASK_ID","SCN");
|
||||
wrapper.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
List<BusProcessNew> busProcessNews= busBean.list(wrapper);
|
||||
|
||||
if (!busProcessNews.isEmpty()){
|
||||
System.out.println(busProcessNews);
|
||||
busProcessNews.forEach(busProcessNew -> {
|
||||
JSONObject jsonObject=JSONObject.parseObject(busProcessNew.getMesg());
|
||||
JSONArray jsonArray=jsonObject.getJSONArray("info");
|
||||
object.getJSONArray("info").addAll(jsonArray);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
nextUserList.add(delegateTask.getVariable("zrUserId",String.class));
|
||||
delegateTask.setVariable("zrUserId1",delegateTask.getVariable("zrUserId"));
|
||||
|
||||
//截止时间 流程描述 创建人
|
||||
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
|
||||
String user = delegateTask.getVariable("user",String.class);
|
||||
String username = delegateTask.getVariable("userName",String.class);
|
||||
String prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任部门对接人汇总并选择审批人";
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
one1.setPrcType("3");
|
||||
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.setUserId(delegateTask.getAssignee());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.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(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
if (delegateTask.getVariable("count",Integer.class) < delegateTask.getVariable("zrIdList",List.class).size()){
|
||||
busProcessNewNext.setTaskId("SCN");
|
||||
}
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Step2Before implements TaskListener {
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew one1 = list.get(0);
|
||||
one1.setTaskId(delegateTask.getId());
|
||||
one1.setTaskInfo(delegateTask.getName());
|
||||
busBean.saveOrUpdate(one1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
//新征求意见流程!!!!!
|
||||
public class Step3After implements TaskListener {
|
||||
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
|
||||
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
|
||||
|
||||
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
|
||||
Datas datas = datasService.getOne(queryWrapper);
|
||||
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
//整备数据
|
||||
|
||||
nextUserList.add(object.getString("spId"));
|
||||
delegateTask.setVariable("spId",object.getString("spId"));
|
||||
|
||||
|
||||
//截止时间 流程描述 创建人
|
||||
String user = delegateTask.getVariable("user",String.class);
|
||||
String username = delegateTask.getVariable("userName",String.class);
|
||||
String prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-审批人审批";
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
one1.setPrcType("3");
|
||||
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.setUserId(delegateTask.getAssignee());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.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(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Step3Before implements TaskListener {
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew one1 = list.get(0);
|
||||
one1.setTaskId(delegateTask.getId());
|
||||
one1.setTaskInfo(delegateTask.getName());
|
||||
busBean.saveOrUpdate(one1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
//新征求意见流程!!!!!
|
||||
public class Step4After implements TaskListener {
|
||||
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
|
||||
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
|
||||
|
||||
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
|
||||
Datas datas = datasService.getOne(queryWrapper);
|
||||
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
String prcName = "";
|
||||
//整备数据
|
||||
if ("0".equals(object.getString("spFlag"))) {
|
||||
nextUserList.add(delegateTask.getVariable("user",String.class));
|
||||
delegateTask.setVariable("bzfgId", delegateTask.getVariable("user",String.class));
|
||||
prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师分线审核";
|
||||
delegateTask.setVariable("spFlag","0");
|
||||
}else {
|
||||
nextUserList.add(delegateTask.getVariable("zrUserId1",String.class));
|
||||
prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任部门对接人汇总并选择审批人";
|
||||
delegateTask.setVariable("spFlag","1");
|
||||
}
|
||||
|
||||
//截止时间 流程描述 创建人
|
||||
String user = delegateTask.getVariable("user",String.class);
|
||||
String username = delegateTask.getVariable("userName",String.class);
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
one1.setPrcType("3");
|
||||
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.setUserId(delegateTask.getAssignee());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.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(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Step4Before implements TaskListener {
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew one1 = list.get(0);
|
||||
one1.setTaskId(delegateTask.getId());
|
||||
one1.setTaskInfo(delegateTask.getName());
|
||||
busBean.saveOrUpdate(one1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,124 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
//新征求意见流程!!!!!
|
||||
public class Step5After implements TaskListener {
|
||||
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
|
||||
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
|
||||
|
||||
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
|
||||
Datas datas = datasService.getOne(queryWrapper);
|
||||
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
String prcName = "";
|
||||
|
||||
//整备数据
|
||||
if ("0".equals(object.getString("bzFlag"))) {
|
||||
//存储了一个计数器
|
||||
if (null==delegateTask.getVariable("count2")){
|
||||
delegateTask.setVariable("count2",1);
|
||||
}else {
|
||||
delegateTask.setVariable("count2",delegateTask.getVariable("count2",Integer.class)+1);
|
||||
}
|
||||
if (delegateTask.getVariable("count2",Integer.class)==delegateTask.getVariable("zrUserIdList",List.class).size()){
|
||||
//数据合并
|
||||
QueryWrapper<BusProcessNew> wrapper=new QueryWrapper<>();
|
||||
wrapper.eq("TASK_ID","SUM");
|
||||
wrapper.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
List<BusProcessNew> busProcessNews= busBean.list(wrapper);
|
||||
|
||||
if (!busProcessNews.isEmpty()){
|
||||
busProcessNews.forEach(busProcessNew -> {
|
||||
JSONObject jsonObject=JSONObject.parseObject(busProcessNew.getMesg());
|
||||
if ("0".equals(jsonObject.getString("bzFlag"))) {
|
||||
JSONArray jsonArray = jsonObject.getJSONArray("info");
|
||||
object.getJSONArray("info").addAll(jsonArray);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
nextUserList.add(delegateTask.getVariable("user",String.class));
|
||||
delegateTask.setVariable("bzfgIdSum",delegateTask.getVariable("user",String.class));
|
||||
delegateTask.setVariable("bzFlag","0");
|
||||
prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总";
|
||||
}else {
|
||||
nextUserList.add(delegateTask.getVariable("zrUserId1",String.class));
|
||||
prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任部门对接人汇总并选择审批人";
|
||||
delegateTask.setVariable("bzFlag","1");
|
||||
}
|
||||
|
||||
//截止时间 流程描述 创建人
|
||||
String user = delegateTask.getVariable("user",String.class);
|
||||
String username = delegateTask.getVariable("userName",String.class);
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
one1.setPrcType("3");
|
||||
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.setUserId(delegateTask.getAssignee());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.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(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
if ("0".equals(object.getString("bzFlag")) && delegateTask.getVariable("count2",Integer.class)<delegateTask.getVariable("zrUserIdList",List.class).size()){
|
||||
//数据合并
|
||||
busProcessNewNext.setTaskId("SUM");
|
||||
}
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Step5Before implements TaskListener {
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew one1 = list.get(0);
|
||||
one1.setTaskId(delegateTask.getId());
|
||||
one1.setTaskInfo(delegateTask.getName());
|
||||
busBean.saveOrUpdate(one1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
//新征求意见流程!!!!!
|
||||
public class Step6After implements TaskListener {
|
||||
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
|
||||
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
|
||||
|
||||
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
|
||||
Datas datas = datasService.getOne(queryWrapper);
|
||||
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
String prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任人会签";;
|
||||
|
||||
//整备数据
|
||||
nextUserList.addAll(delegateTask.getVariable("zrList",List.class));
|
||||
delegateTask.setVariable("responUserList",delegateTask.getVariable("zrList",List.class));
|
||||
delegateTask.setVariable("hqMark",0);
|
||||
delegateTask.setVariable("bdMark",0);
|
||||
delegateTask.setVariable("hqCount",null);
|
||||
delegateTask.setVariable("bdCount",null);
|
||||
//截止时间 流程描述 创建人
|
||||
String user = delegateTask.getVariable("user",String.class);
|
||||
String username = delegateTask.getVariable("userName",String.class);
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
one1.setPrcType("3");
|
||||
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.setUserId(delegateTask.getAssignee());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.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(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Step6Before implements TaskListener {
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew one1 = list.get(0);
|
||||
one1.setTaskId(delegateTask.getId());
|
||||
one1.setTaskInfo(delegateTask.getName());
|
||||
busBean.saveOrUpdate(one1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,115 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
//新征求意见流程!!!!!
|
||||
public class Step7After implements TaskListener {
|
||||
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
|
||||
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
|
||||
|
||||
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
|
||||
Datas datas = datasService.getOne(queryWrapper);
|
||||
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
|
||||
String prcName =delegateTask.getVariable("cid")+"-标准征求意见流程";
|
||||
|
||||
if (null==delegateTask.getVariable("hqCount")){
|
||||
delegateTask.setVariable("hqCount",1);
|
||||
}else {
|
||||
delegateTask.setVariable("hqCount",delegateTask.getVariable("hqCount",Integer.class)+1);
|
||||
}
|
||||
|
||||
//整备数据
|
||||
if ("0".equals(object.getString("hqFlag"))) {
|
||||
delegateTask.setVariable("hqMark",delegateTask.getVariable("hqMark",Integer.class));
|
||||
nextUserList.add(delegateTask.getVariable("bzLeaderId",String.class));
|
||||
delegateTask.setVariable("hqFlag", "0");
|
||||
}else {
|
||||
delegateTask.setVariable("hqMark",delegateTask.getVariable("hqMark",Integer.class)+1);
|
||||
nextUserList.add(delegateTask.getVariable("bzfgIdSum",String.class));
|
||||
delegateTask.setVariable("hqFlag", "1");
|
||||
}
|
||||
if (delegateTask.getVariable("hqCount",Integer.class)==delegateTask.getVariable("responUserList",List.class).size()) {
|
||||
if (0 == delegateTask.getVariable("hqMark", Integer.class)) {
|
||||
prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-部长+对接人审批";
|
||||
nextUserList.addAll(delegateTask.getVariable("zrUserIdList",List.class));
|
||||
} else {
|
||||
prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总";
|
||||
}
|
||||
}
|
||||
|
||||
delegateTask.setVariable("userList",nextUserList);
|
||||
|
||||
//截止时间 流程描述 创建人
|
||||
String user = delegateTask.getVariable("user",String.class);
|
||||
String username = delegateTask.getVariable("userName",String.class);
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
one1.setPrcType("3");
|
||||
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.setUserId(delegateTask.getAssignee());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.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(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
if ("0".equals(object.getString("hqFlag")) && delegateTask.getVariable("hqCount",Integer.class)<delegateTask.getVariable("responUserList",List.class).size()) {
|
||||
busProcessNewNext.setTaskId("Step7");
|
||||
}
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Step7Before implements TaskListener {
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew one1 = list.get(0);
|
||||
one1.setTaskId(delegateTask.getId());
|
||||
one1.setTaskInfo(delegateTask.getName());
|
||||
busBean.saveOrUpdate(one1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,113 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
//新征求意见流程!!!!!
|
||||
public class Step8After implements TaskListener {
|
||||
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
|
||||
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
|
||||
|
||||
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
|
||||
Datas datas = datasService.getOne(queryWrapper);
|
||||
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
|
||||
String prcName =delegateTask.getVariable("cid")+"-标准征求意见流程";
|
||||
|
||||
if (null==delegateTask.getVariable("bdCount")){
|
||||
delegateTask.setVariable("bdCount",1);
|
||||
}else {
|
||||
delegateTask.setVariable("bdCount",delegateTask.getVariable("bdCount",Integer.class)+1);
|
||||
}
|
||||
|
||||
//整备数据
|
||||
if ("0".equals(object.getString("bdFlag"))) {
|
||||
delegateTask.setVariable("bdMark",delegateTask.getVariable("bdMark",Integer.class));
|
||||
nextUserList.add(delegateTask.getVariable("directorUser",String.class));
|
||||
delegateTask.setVariable("hqFlag", "0");
|
||||
}else {
|
||||
delegateTask.setVariable("bdMark",delegateTask.getVariable("bdMark",Integer.class)+1);
|
||||
nextUserList.add(delegateTask.getVariable("bzfgIdSum",String.class));
|
||||
delegateTask.setVariable("hqFlag", "1");
|
||||
}
|
||||
if (delegateTask.getVariable("bdCount",Integer.class)==delegateTask.getVariable("userList",List.class).size()) {
|
||||
if (0 == delegateTask.getVariable("bdMark", Integer.class)) {
|
||||
prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定";
|
||||
delegateTask.setVariable("bdFlag","0");
|
||||
} else {
|
||||
prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总";
|
||||
delegateTask.setVariable("bdFlag","1");
|
||||
}
|
||||
}
|
||||
delegateTask.setVariable("directorUser",delegateTask.getVariable("directorUser",String.class));
|
||||
|
||||
//截止时间 流程描述 创建人
|
||||
String user = delegateTask.getVariable("user",String.class);
|
||||
String username = delegateTask.getVariable("userName",String.class);
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
one1.setPrcType("3");
|
||||
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.setUserId(delegateTask.getAssignee());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.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(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
if ("0".equals(object.getString("bdFlag")) && delegateTask.getVariable("bdCount",Integer.class)<delegateTask.getVariable("userList",List.class).size()) {
|
||||
busProcessNewNext.setTaskId("Step8");
|
||||
}
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Step8Before implements TaskListener {
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew one1 = list.get(0);
|
||||
one1.setTaskId(delegateTask.getId());
|
||||
one1.setTaskInfo(delegateTask.getName());
|
||||
busBean.saveOrUpdate(one1);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
//新征求意见流程!!!!!
|
||||
public class Step9After implements TaskListener {
|
||||
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
|
||||
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
|
||||
|
||||
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
|
||||
Datas datas = datasService.getOne(queryWrapper);
|
||||
|
||||
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
|
||||
delegateTask.setVariable("objectJson",object);
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
|
||||
String prcName="";
|
||||
if ("0".equals(object.getString("directorFlag"))){
|
||||
delegateTask.setVariable("directorFlag","0");
|
||||
prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-工程研究总院院长批准";
|
||||
nextUserList.add(object.getString("presidentUser"));
|
||||
delegateTask.setVariable("presidentUser",object.getString("presidentUser"));
|
||||
}else {
|
||||
delegateTask.setVariable("directorFlag","1");
|
||||
nextUserList.add(delegateTask.getVariable("bzfgIdSum",String.class));
|
||||
prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总";
|
||||
}
|
||||
//截止时间 流程描述 创建人
|
||||
String user = delegateTask.getVariable("user",String.class);
|
||||
String username = delegateTask.getVariable("userName",String.class);
|
||||
QueryWrapper queryWrapper2 = new QueryWrapper();
|
||||
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
|
||||
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
|
||||
if(one1!=null){
|
||||
one1.setPrcType("3");
|
||||
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.setUserId(delegateTask.getAssignee());
|
||||
busProcessNew.setTaskId(delegateTask.getId());
|
||||
busProcessNew.setCommitText(object.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(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setPrcName(prcName);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
|
||||
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
|
||||
import com.ydw.bat.wkflow.util.SpringContextUtil;
|
||||
import org.activiti.engine.delegate.DelegateTask;
|
||||
import org.activiti.engine.delegate.TaskListener;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class Step9Before implements TaskListener {
|
||||
@Override
|
||||
public void notify(DelegateTask delegateTask) {
|
||||
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
|
||||
QueryWrapper queryWrapper1 = new QueryWrapper();
|
||||
queryWrapper1.isNull("TASK_ID");
|
||||
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
|
||||
List<BusProcessNew> list = busBean.list(queryWrapper1);
|
||||
if(!list.isEmpty()){
|
||||
BusProcessNew one1 = list.get(0);
|
||||
one1.setTaskId(delegateTask.getId());
|
||||
one1.setTaskInfo(delegateTask.getName());
|
||||
busBean.saveOrUpdate(one1);
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -35,7 +35,7 @@ public class ProcessStep5After implements TaskListener {
|
||||
delegateTask.setVariable("objectJson", object);
|
||||
//标准法规部业务经理Id
|
||||
List<String> nextUserList = new ArrayList();
|
||||
String prcName = "";
|
||||
String prcName = "企标制修订计划-部门高级经理审批";
|
||||
//根据意见选择 企标状态并对企标信息进行修改 bzfgId
|
||||
nextUserList.add(delegateTask.getVariable("topmanagerId",String.class));
|
||||
|
||||
|
||||
+27
-27
@@ -48,33 +48,33 @@ public class PresidentApprovalAfter implements TaskListener {
|
||||
if("1".equals(object.getString("gsfz"))){
|
||||
delegateTask.setVariable("gsfz", "1");
|
||||
JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList"));
|
||||
List<WgDept> wgDept=new ArrayList<>();
|
||||
jsonArray.forEach(o -> {
|
||||
JSONObject os=JSONObject.parseObject(o.toString());
|
||||
WgDept wgDept1=new WgDept();
|
||||
wgDept1.setWgId(object.getString("standId"));
|
||||
wgDept1.setDeptOrder(os.getString("itemsNum"));
|
||||
wgDept1.setDeptPeopleId(os.getString("itemsName"));
|
||||
wgDept1.setIdentity(os.getString("responsibleUnitShow"));
|
||||
wgDept1.setJoinfile(os.getString("zxUserIdName"));
|
||||
wgDept1.setJoinId(os.getString("itermsConditions"));
|
||||
wgDept.add(wgDept1);
|
||||
});
|
||||
|
||||
JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class));
|
||||
jsonArray1.forEach(obj ->{
|
||||
JSONObject object1 = JSONObject.parseObject(obj.toString());
|
||||
WgDept wgDept1=new WgDept();
|
||||
wgDept1.setWgId(object.getString("standId"));
|
||||
wgDept1.setDeptOrder(object1.getString("itemsNum"));
|
||||
wgDept1.setDeptPeopleId(object1.getString("itemsName"));
|
||||
wgDept1.setIdentity(object1.getString("responsibleUnitShow"));
|
||||
wgDept1.setJoinfile(object1.getString("zxUserIdName"));
|
||||
wgDept1.setJoinId(object1.getString("itermsConditions"));
|
||||
wgDept.add(wgDept1);
|
||||
});
|
||||
|
||||
lawsUserInfoService.wgDeptSaveBatch(wgDept);
|
||||
// List<WgDept> wgDept=new ArrayList<>();
|
||||
// jsonArray.forEach(o -> {
|
||||
// JSONObject os=JSONObject.parseObject(o.toString());
|
||||
// WgDept wgDept1=new WgDept();
|
||||
// wgDept1.setWgId(object.getString("standId"));
|
||||
// wgDept1.setDeptOrder(os.getString("itemsNum"));
|
||||
// wgDept1.setDeptPeopleId(os.getString("itemsName"));
|
||||
// wgDept1.setIdentity(os.getString("responsibleUnitShow"));
|
||||
// wgDept1.setJoinfile(os.getString("zxUserIdName"));
|
||||
// wgDept1.setJoinId(os.getString("itermsConditions"));
|
||||
// wgDept.add(wgDept1);
|
||||
// });
|
||||
//
|
||||
// JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class));
|
||||
// jsonArray1.forEach(obj ->{
|
||||
// JSONObject object1 = JSONObject.parseObject(obj.toString());
|
||||
// WgDept wgDept1=new WgDept();
|
||||
// wgDept1.setWgId(object.getString("standId"));
|
||||
// wgDept1.setDeptOrder(object1.getString("itemsNum"));
|
||||
// wgDept1.setDeptPeopleId(object1.getString("itemsName"));
|
||||
// wgDept1.setIdentity(object1.getString("responsibleUnitShow"));
|
||||
// wgDept1.setJoinfile(object1.getString("zxUserIdName"));
|
||||
// wgDept1.setJoinId(object1.getString("itermsConditions"));
|
||||
// wgDept.add(wgDept1);
|
||||
// });
|
||||
//
|
||||
// lawsUserInfoService.wgDeptSaveBatch(wgDept);
|
||||
|
||||
prcName = "政策课题组参会流程";
|
||||
}else{
|
||||
|
||||
+27
-27
@@ -54,34 +54,34 @@ public class PGREPresidentApprovalAfter implements TaskListener {
|
||||
if ("1".equals(object.getString("gsfz"))) {
|
||||
delegateTask.setVariable("gsfz", "1");
|
||||
|
||||
JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList"));
|
||||
List<WgDept> wgDept=new ArrayList<>();
|
||||
jsonArray.forEach(o -> {
|
||||
JSONObject os=JSONObject.parseObject(o.toString());
|
||||
WgDept wgDept1=new WgDept();
|
||||
wgDept1.setWgId(object.getString("standId"));
|
||||
wgDept1.setDeptOrder(os.getString("itemsNum"));
|
||||
wgDept1.setDeptPeopleId(os.getString("itemsName"));
|
||||
wgDept1.setIdentity(os.getString("responsibleUnitShow"));
|
||||
wgDept1.setJoinfile(os.getString("zxUserIdName"));
|
||||
wgDept1.setJoinId(os.getString("itermsConditions"));
|
||||
wgDept.add(wgDept1);
|
||||
});
|
||||
// JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList"));
|
||||
// List<WgDept> wgDept=new ArrayList<>();
|
||||
// jsonArray.forEach(o -> {
|
||||
// JSONObject os=JSONObject.parseObject(o.toString());
|
||||
// WgDept wgDept1=new WgDept();
|
||||
// wgDept1.setWgId(object.getString("standId"));
|
||||
// wgDept1.setDeptOrder(os.getString("itemsNum"));
|
||||
// wgDept1.setDeptPeopleId(os.getString("itemsName"));
|
||||
// wgDept1.setIdentity(os.getString("responsibleUnitShow"));
|
||||
// wgDept1.setJoinfile(os.getString("zxUserIdName"));
|
||||
// wgDept1.setJoinId(os.getString("itermsConditions"));
|
||||
// wgDept.add(wgDept1);
|
||||
// });
|
||||
//
|
||||
// JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class));
|
||||
// jsonArray1.forEach(obj ->{
|
||||
// JSONObject object1 = JSONObject.parseObject(obj.toString());
|
||||
// WgDept wgDept1=new WgDept();
|
||||
// wgDept1.setWgId(object.getString("standId"));
|
||||
// wgDept1.setDeptOrder(object1.getString("itemsNum"));
|
||||
// wgDept1.setDeptPeopleId(object1.getString("itemsName"));
|
||||
// wgDept1.setIdentity(object1.getString("responsibleUnitShow"));
|
||||
// wgDept1.setJoinfile(object1.getString("zxUserIdName"));
|
||||
// wgDept1.setJoinId(object1.getString("itermsConditions"));
|
||||
// wgDept.add(wgDept1);
|
||||
// });
|
||||
|
||||
JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class));
|
||||
jsonArray1.forEach(obj ->{
|
||||
JSONObject object1 = JSONObject.parseObject(obj.toString());
|
||||
WgDept wgDept1=new WgDept();
|
||||
wgDept1.setWgId(object.getString("standId"));
|
||||
wgDept1.setDeptOrder(object1.getString("itemsNum"));
|
||||
wgDept1.setDeptPeopleId(object1.getString("itemsName"));
|
||||
wgDept1.setIdentity(object1.getString("responsibleUnitShow"));
|
||||
wgDept1.setJoinfile(object1.getString("zxUserIdName"));
|
||||
wgDept1.setJoinId(object1.getString("itermsConditions"));
|
||||
wgDept.add(wgDept1);
|
||||
});
|
||||
|
||||
lawsUserInfoService.wgDeptSaveBatch(wgDept);
|
||||
// lawsUserInfoService.wgDeptSaveBatch(wgDept);
|
||||
|
||||
prcName = "政策课题组入会流程";
|
||||
} else {
|
||||
|
||||
+6
-6
@@ -75,9 +75,9 @@ public class PEPDepartLeaderAfter implements TaskListener {
|
||||
sarStandUnqualified.setCloseState(1);
|
||||
sarStandUnqualified.setCreateTime(new Date());
|
||||
sarStandUnqualified.setProductName(o.getProjectName());
|
||||
sarStandUnqualified.setQaEngineer(o.getQualityEngineerName());
|
||||
sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineerName());
|
||||
sarStandUnqualified.setDutyEngineer(o.getResponsibleEngineer());
|
||||
sarStandUnqualified.setQaEngineer(delegateTask.getVariable("qualityEngineerName",String.class));
|
||||
sarStandUnqualified.setAuthEngineer(delegateTask.getVariable("certifiedEngineerName",String.class));
|
||||
sarStandUnqualified.setDutyEngineer(o.getImplementerId());
|
||||
sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit());
|
||||
sarStandUnqualified.setProductType("research");
|
||||
sarStandUnqualified.setReason(object1.getString("noCompliance"));
|
||||
@@ -99,9 +99,9 @@ public class PEPDepartLeaderAfter implements TaskListener {
|
||||
sarStandUnqualified.setCloseState(1);
|
||||
sarStandUnqualified.setCreateTime(new Date());
|
||||
sarStandUnqualified.setProductName(o.getProjectName());
|
||||
sarStandUnqualified.setQaEngineer(o.getQualityEngineerName());
|
||||
sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineerName());
|
||||
sarStandUnqualified.setDutyEngineer(o.getResponsibleEngineer());
|
||||
sarStandUnqualified.setQaEngineer(delegateTask.getVariable("qualityEngineerName",String.class));
|
||||
sarStandUnqualified.setAuthEngineer(delegateTask.getVariable("certifiedEngineerName",String.class));
|
||||
sarStandUnqualified.setDutyEngineer(o.getImplementerId());
|
||||
sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit());
|
||||
sarStandUnqualified.setReason(object1.getString("zcNoCompliance"));
|
||||
sarStandUnqualified.setProductType("product");
|
||||
|
||||
+6
-13
@@ -45,14 +45,7 @@ public class PEPffresPersonAfter implements TaskListener {
|
||||
delegateTask.setVariable("objectJson", object);
|
||||
|
||||
String prcName = "";
|
||||
if ("2".equals(object.getString("fenFlag")) && null == delegateTask.getVariable("PEPCount") && delegateTask.getVariable("workPeoples", List.class).size()==1){
|
||||
prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批";
|
||||
}
|
||||
else if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) {
|
||||
prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批";
|
||||
} else {
|
||||
prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-合规性评估";
|
||||
}
|
||||
prcName = delegateTask.getVariable("stands", String.class) + "-标准项目合规评估-汇总审批";
|
||||
|
||||
|
||||
List<String> nextUserList = new ArrayList();
|
||||
@@ -68,11 +61,11 @@ public class PEPffresPersonAfter implements TaskListener {
|
||||
delegateTask.setVariable("fenFlag", "1");
|
||||
} else {
|
||||
//不通过就要驳回
|
||||
object.put("dataList",delegateTask.getVariable(object.getString("key")));
|
||||
object.put("dataList", delegateTask.getVariable(object.getString("key")));
|
||||
nextUserList.add(String.valueOf(delegateTask.getVariable("workPeople")));
|
||||
delegateTask.setVariable("workPeople", String.valueOf(delegateTask.getVariable("workPeople")));
|
||||
delegateTask.setVariable("fenFlag", "2");
|
||||
object.put("mark","back");
|
||||
object.put("mark", "back");
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
@@ -114,13 +107,13 @@ public class PEPffresPersonAfter implements TaskListener {
|
||||
}
|
||||
}
|
||||
if (String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size()))) {
|
||||
|
||||
oneStep1(delegateTask, busBean, nextUserList,prcName);
|
||||
prcName = delegateTask.getVariable("stands", String.class) + "-标准项目合规评估-合规性评估";
|
||||
oneStep1(delegateTask, busBean, nextUserList, prcName);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void oneStep1(DelegateTask delegateTask, IBusProcessNewService busBean, List<String> nextUserList,String prcName) {
|
||||
private void oneStep1(DelegateTask delegateTask, IBusProcessNewService busBean, List<String> nextUserList, String prcName) {
|
||||
//中间对象
|
||||
List<String> CPX = new ArrayList<>();
|
||||
Map<String, List<BusProcessNew>> map = new HashMap<>();
|
||||
|
||||
@@ -52,6 +52,11 @@ public class PEPstartAfter implements TaskListener {
|
||||
|
||||
delegateTask.setVariable("certifiedEngineerName",object.getString("certifiedEngineerName"));
|
||||
delegateTask.setVariable("qualityEngineerName",object.getString("qualityEngineerName"));
|
||||
|
||||
//认证工程师Id
|
||||
delegateTask.setVariable("certifiedEngineer",object.getString("certifiedEngineer"));
|
||||
//质量工程师Id
|
||||
delegateTask.setVariable("qualityEngineer",object.getString("qualityEngineer"));
|
||||
//截止时间 流程描述 创建人
|
||||
String user = object.getString("prcCreateUser");
|
||||
String username = object.getString("prcCreateUserName");
|
||||
|
||||
+2
-2
@@ -46,7 +46,7 @@ public class SRPManagerApproveAfter implements TaskListener{
|
||||
|
||||
if("1".equalsIgnoreCase(approvalOpinion)){
|
||||
delegateTask.setVariable("jlFlag",1);
|
||||
delegateTask.setVariable("applyUserId",object.getString("applyUpdUserId"));
|
||||
delegateTask.setVariable("applyUserId",delegateTask.getVariable("createUser",String.class));
|
||||
BusProcessNew busProcessNew = new BusProcessNew();
|
||||
busProcessNew.setMsgType("clause");
|
||||
busProcessNew.setPId(delegateTask.getProcessInstanceId());
|
||||
@@ -54,7 +54,7 @@ public class SRPManagerApproveAfter implements TaskListener{
|
||||
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNew.setFinishFlag("0");
|
||||
busProcessNew.setTaskInfo(delegateTask.getName());
|
||||
busProcessNew.setUserId(object.getString("applyUpdUserId"));
|
||||
busProcessNew.setUserId(delegateTask.getVariable("createUser",String.class));
|
||||
busProcessNew.setPrcName(delegateTask.getVariable("listName",String.class)+"-标准法规清单-修订");
|
||||
busBean.save(busProcessNew);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user