FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

政策课题组入会流程---代码修改

Browse Source
This commit is contained in:
koweiyi
2021-10-27 09:11:18 +08:00
parent 839c0a583a
commit 2e5a731625
9 changed files with 140 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java
+26 -38
View File
@@ -50,36 +50,10 @@ public class PGREPresidentApprovalAfter implements TaskListener {
delegateTask.setVariable("gsfz", "0");
if (StringUtils.isNotBlank(object.getString("revisionId"))) {
delegateTask.setVariable("revisionInformation", object.getString("revisionId"));
nextUserList.add(object.getString("revisionId"));
}
}
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
delegateTask.setVariable("createUser", user);
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("createUserName", username);
String standName = object.getString("listName");
delegateTask.setVariable("listName", standName);
String prcName = "";
// if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签";
// }else {
// prcName = standName + "-标准法规清单申请-经理审批";
// }
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("17");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
// 存储当前节点意见
// 存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -92,6 +66,30 @@ public class PGREPresidentApprovalAfter implements TaskListener {
busBean.saveOrUpdate(busProcessNews);
}
}
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
delegateTask.setVariable("createUser",user);
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
prcName = standName + "-政策课题组入会流程-";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("17");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
@@ -105,16 +103,6 @@ public class PGREPresidentApprovalAfter implements TaskListener {
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.setUserId(object.getString("jlUserId"));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class PGREPresidentApprovalBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzqdfbStep3?prcType=4");
one1.setLink("bzqdfbStep3?prcType=17");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java
+27 -69
View File
@@ -48,75 +48,19 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
delegateTask.setVariable("fgfzj", "1");
if (StringUtils.isNotBlank(object.getString("presidentId"))) {
delegateTask.setVariable("presidentApproval", object.getString("presidentId"));
nextUserList.add(object.getString("presidentId"));
}
} else if ("0".equals(object.getString("fgfzj"))) {
delegateTask.setVariable("fgfzj", "0");
if (StringUtils.isNotBlank(object.getString("revisionId"))){
delegateTask.setVariable("revisionInformation", object.getString("revisionId"));
}
}else{
delegateTask.setVariable("fgfzj", "2");
}
// if(object.getString("signFlag").equals("1")){
// delegateTask.setVariable("hqFlag",1);
//
// if(StringUtils.isNotBlank(object.getString("dockUser"))){
//
// if(object.getString("dockUser").contains(",")){
// nextUserList = Arrays.asList(object.getString("dockUser").split(","));
// }else {
// nextUserList.add(object.getString("dockUser"));
// }
// // 配置多实例
// delegateTask.setVariable("hqUserList",nextUserList);
// }
// }else {
// delegateTask.setVariable("hqFlag",2);
// if(StringUtils.isNotBlank(object.getString("directorUser"))){
// delegateTask.setVariable("managerUserId",object.getString("directorUser"));
// nextUserList.add(object.getString("directorUser"));
// }
// }
//
// //设置审批中的状态
// SarLawsDetailedList lawsDetailedList=lawsUserInfoService.getStandById(object.getString("standId"));
// if (null!=lawsDetailedList){
// DetailedUpDto detailed=new DetailedUpDto();
// detailed.setId(object.getString("standId"));
// detailed.setDetailedListState("3");
// lawsUserInfoService.updateLaws(detailed);
// }else {
// throw new ActivitiException("清单信息不存在，若多次出现此信息请联系管理员！！！");
// }
//
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
delegateTask.setVariable("createUser", user);
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("createUserName", username);
String standName = object.getString("listName");
delegateTask.setVariable("listName", standName);
String prcName = "";
// if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签";
// }else {
// prcName = standName + "-标准法规清单申请-经理审批";
// }
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("17");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
// 存储当前节点意见
// 存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -129,6 +73,30 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
busBean.saveOrUpdate(busProcessNews);
}
}
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
delegateTask.setVariable("createUser",user);
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
prcName = standName + "-标准化活动入会流程-";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("17");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
@@ -142,16 +110,6 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
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.setUserId(object.getString("jlUserId"));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java
+16
View File
@@ -13,6 +13,22 @@ import java.util.List;
public class PRGEInspectorApprovalBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("policyResearchGroupEnrollment3?prcType=17");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java
+25 -28
View File
@@ -50,14 +50,32 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
delegateTask.setVariable("fgfbz", "1");
if (StringUtils.isNotBlank(object.getString("inspectorId"))){
delegateTask.setVariable("inspectorApproval", object.getString("inspectorId"));
nextUserList.add(object.getString("inspectorId"));
}
}else{
delegateTask.setVariable("fgfbz","0");
if (StringUtils.isNotBlank(object.getString("revisionId"))){
delegateTask.setVariable("revisionInformation", object.getString("revisionId"));
nextUserList.add(object.getString("revisionId"));
}
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
//截止时间 流程描述 创建人
@@ -69,32 +87,21 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
prcName = standName + "-标准化活动入会流程-副总监批准";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
if (one1 != null) {
one1.setPrcType("17");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
// 存储当前节点意见
if (null!=object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if(!list.isEmpty()){
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -106,16 +113,6 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
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.setUserId(object.getString("jlUserId"));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java
+20 -20
View File
@@ -11,28 +11,28 @@ import org.activiti.engine.delegate.TaskListener;
import java.util.List;
public class PRGEMinisterConfirmBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
}
// @Override
// public void notify(DelegateTask delegateTask) {
// IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
// QueryWrapper queryWrapper1 = new QueryWrapper();
// queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
// queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
// queryWrapper1.isNull("TASK_ID");
// List<BusProcessNew> list = busBean.list(queryWrapper1);
// if(!list.isEmpty()){
// BusProcessNew one1 = list.get(0);
// one1.setTaskId(delegateTask.getId());
// busBean.saveOrUpdate(one1);
//
// CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
// one1.setLink("policyResearchGroupEnrollment2?prcType=17");
// one1.setTaskInfo(delegateTask.getName());
// oaService.sendTodoMq(one1);
// }
// }
@Override
public void notify(DelegateTask delegateTask) {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
queryWrapper1.isNull("TASK_ID");
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one1 = list.get(0);
one1.setTaskId(delegateTask.getId());
busBean.saveOrUpdate(one1);
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("policyResearchGroupEnrollment2?prcType=17");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java
+11 -36
View File
@@ -46,50 +46,35 @@ public class PRGEStartAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
if(StringUtils.isNotBlank(object.getString("ministerId"))){
delegateTask.setVariable("ministerConfirm", object.getString("ministerId"));
nextUserList.add(object.getString("ministerId"));
}
//截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
String user = object.getString("revisionId");
delegateTask.setVariable("createUser",user);
String username = object.getString("prcCreateUserName");
String username = object.getString("revisionIdName");
delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
// if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签";
// }else {
// prcName = standName + "-标准法规清单申请-经理审批";
// }
prcName = standName + "-标准化活动入会流程-副部长审核";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
if (one1 != null) {
one1.setPrcType("17");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
// 存储当前节点意见
if (null!=object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if(!list.isEmpty()){
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
if (!nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
@@ -101,16 +86,6 @@ public class PRGEStartAfter implements TaskListener {
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.setUserId(object.getString("jlUserId"));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class RevisionInformationBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzqdfbStep3?prcType=4");
one1.setLink("bzqdfbStep3?prcType=17");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java
+13 -36
View File
@@ -45,24 +45,21 @@ public class RevisonInformationAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
if (StringUtils.isNotBlank(object.getString("ministerId"))) {
delegateTask.setVariable("ministerConfirm", object.getString("ministerId"));
nextUserList.add(object.getString("ministerId"));
delegateTask.setVariable("ministerConfirm", nextUserList);
// delegateTask.setVariable("ministerConfirm", object.getString("ministerId"));
}
//截止时间 流程描述 创建人
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
delegateTask.setVariable("createUser", user);
delegateTask.setVariable("createUser",user);
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("createUserName", username);
delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName");
delegateTask.setVariable("listName", standName);
String prcName = "";
// if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签";
// }else {
// prcName = standName + "-标准法规清单申请-经理审批";
// }
delegateTask.setVariable("listName",standName);
String prcName="";
prcName = standName + "-政策课题组入会流程-";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -73,20 +70,7 @@ public class RevisonInformationAfter implements TaskListener {
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
// 存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
queryWrapper3.eq("USER_ID", delegateTask.getAssignee());
List<BusProcessNew> list = busBean.list(queryWrapper3);
if (!list.isEmpty()) {
BusProcessNew busProcessNews = list.get(0);
busProcessNews.setTaskId(delegateTask.getId());
busProcessNews.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(busProcessNews);
}
}
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
@@ -100,16 +84,9 @@ public class RevisonInformationAfter implements TaskListener {
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.setUserId(object.getString("jlUserId"));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
}