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

政策课题组-prcName-代码修改

Browse Source
This commit is contained in:
koweiyi
2021-10-27 15:02:42 +08:00
parent 2a41b35d76
commit eb05c2f40d
16 changed files with 181 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java
+16 -12
View File
@@ -35,18 +35,6 @@ public class ApprovalAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
if("1".equals(object.getString("shyFlag"))){
delegateTask.setVariable("shyFlag", "1");
}else{
delegateTask.setVariable("shyFlag", "0");
if(StringUtils.isNotBlank(object.getString("revisionId"))){
delegateTask.setVariable("revision", object.getString("revisionId"));
}
}
//截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
@@ -56,6 +44,22 @@ public class ApprovalAfter implements TaskListener {
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
List<String> nextUserList = new ArrayList();
if("1".equals(object.getString("shyFlag"))){
delegateTask.setVariable("shyFlag", "1");
prcName = standName + "-政策课题组会后流程";
}else{
delegateTask.setVariable("shyFlag", "0");
if(StringUtils.isNotBlank(object.getString("revisionId"))){
delegateTask.setVariable("revision", object.getString("revisionId"));
nextUserList.add(object.getString("revisionId"));
prcName = standName + "-政策课题组会后流程-申请人修订申请信息";
}
}
// if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签";
// }else {
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java
+23
View File
@@ -1,11 +1,34 @@
package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
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 ApprovalBefore 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("policyResearchGroupEnrollment2?prcType=19");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java
+2
View File
@@ -39,6 +39,7 @@ public class InputInformationAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
if(StringUtils.isNotBlank(object.getString("approvalId"))){
delegateTask.setVariable("approval", object.getString("approvalId"));
nextUserList.add(object.getString("approvalId"));
}
//截止时间 流程描述 创建人
@@ -50,6 +51,7 @@ public class InputInformationAfter implements TaskListener {
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
prcName = standName + "-政策课题组会后流程-审核员批准";
// if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签";
// }else {
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java
+23
View File
@@ -1,11 +1,34 @@
package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
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 InputInformationBefore 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("policyResearchGroupEnrollment2?prcType=19");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java
+2 -6
View File
@@ -39,6 +39,7 @@ public class PRGAMStartAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
if(StringUtils.isNotBlank(object.getString("applicantId"))){
delegateTask.setVariable("inputInformation", object.getString("applicantId"));
nextUserList.add(object.getString("applicantId"));
}
//截止时间 流程描述 创建人
@@ -49,12 +50,7 @@ public class PRGAMStartAfter implements TaskListener {
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 + "-标准法规清单申请-经理审批";
// }
String prcName=standName + "-政策课题组会后流程-申请人填写表单";
QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java
+1
View File
@@ -39,6 +39,7 @@ public class RevisionInformationAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
if(StringUtils.isNotBlank(object.getString("approvalId"))){
delegateTask.setVariable("approval", object.getString("approvalId"));
nextUserList.add(object.getString("approvalId"));
}
//截止时间 流程描述 创建人
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java
+23
View File
@@ -1,11 +1,34 @@
package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
import com.ydw.bat.wkflow.business_mq.service.CreateMQService;
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 RevisionInformationBefore 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("policyResearchGroupEnrollment2?prcType=19");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java
+23 -19
View File
@@ -35,25 +35,6 @@ public class MinisterApprovalAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
if("1".equals(object.getString("fgfbz"))){
delegateTask.setVariable("fgfbz", "1");
if (StringUtils.isNotBlank(object.getString("presidentId"))){
nextUserList.add(object.getString("presidentId"));
delegateTask.setVariable("presidentApproval", object.getString("presidentId"));
}
}else if ("0".equals(object.getString("fgfbz"))){
delegateTask.setVariable("fgfbz", "0");
if (StringUtils.isNotBlank(object.getString("revisionId"))){
nextUserList.add(object.getString("revisionId"));
delegateTask.setVariable("revision", object.getString("revisionId"));
}
}else{
delegateTask.setVariable("fgfbz", "2");
}
//截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
@@ -63,6 +44,29 @@ public class MinisterApprovalAfter implements TaskListener {
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
List<String> nextUserList = new ArrayList();
if("1".equals(object.getString("fgfbz"))){
delegateTask.setVariable("fgfbz", "1");
if (StringUtils.isNotBlank(object.getString("presidentId"))){
nextUserList.add(object.getString("presidentId"));
delegateTask.setVariable("presidentApproval", object.getString("presidentId"));
prcName = standName + "-政策课题组参会流程-公司副总批准";
}
}else if ("0".equals(object.getString("fgfbz"))){
delegateTask.setVariable("fgfbz", "0");
if (StringUtils.isNotBlank(object.getString("revisionId"))){
nextUserList.add(object.getString("revisionId"));
delegateTask.setVariable("revision", object.getString("revisionId"));
prcName = standName + "-政策课题组参会流程-修订参会信息";
}
}else{
delegateTask.setVariable("fgfbz", "2");
prcName = standName + "-政策课题组参会流程";
}
// if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签";
// }else {
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java
+2 -1
View File
@@ -50,7 +50,8 @@ public class PRGAMStartAfter implements TaskListener {
delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
String prcName = "";
prcName= standName + "-政策课题组参会流程-法规认证部副部长审核";
// if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签";
// }else {
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java
+19 -11
View File
@@ -36,17 +36,6 @@ public class PresidentApprovalAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
if("1".equals(object.getString("gsfz"))){
delegateTask.setVariable("gsfz", "1");
}else{
delegateTask.setVariable("gsfz", "0");
if (StringUtils.isNotBlank(object.getString("revisionId"))){
nextUserList.add(object.getString("revisionId"));
delegateTask.setVariable("revision", object.getString("revisionId"));
}
}
//截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
@@ -56,6 +45,25 @@ public class PresidentApprovalAfter implements TaskListener {
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
List<String> nextUserList = new ArrayList();
if("1".equals(object.getString("gsfz"))){
delegateTask.setVariable("gsfz", "1");
prcName = standName + "-政策课题组参会流程";
}else{
delegateTask.setVariable("gsfz", "0");
if (StringUtils.isNotBlank(object.getString("revisionId"))){
nextUserList.add(object.getString("revisionId"));
delegateTask.setVariable("revision", object.getString("revisionId"));
prcName = standName + "-政策课题组参会流程-修订参会信息";
}
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java
+9 -8
View File
@@ -35,14 +35,6 @@ public class RevisionInformationAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
if (StringUtils.isNotBlank(object.getString("ministerId"))){
nextUserList.add(object.getString("ministerId"));
delegateTask.setVariable("ministerApproval", object.getString("ministerId"));
}
//截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser");
@@ -52,6 +44,15 @@ public class RevisionInformationAfter implements TaskListener {
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
List<String> nextUserList = new ArrayList();
if (StringUtils.isNotBlank(object.getString("ministerId"))){
nextUserList.add(object.getString("ministerId"));
delegateTask.setVariable("ministerApproval", object.getString("ministerId"));
prcName = standName + "-政策课题组参会流程-法规认证部副部长审核";
}
// if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签";
// }else {
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java
+11 -11
View File
@@ -41,17 +41,28 @@ public class PGREPresidentApprovalAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
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=standName;
List<String> nextUserList = new ArrayList();
if ("1".equals(object.getString("gsfz"))) {
delegateTask.setVariable("gsfz", "1");
prcName += "-政策课题组入会流程";
} else {
delegateTask.setVariable("gsfz", "0");
if (StringUtils.isNotBlank(object.getString("revisionId"))) {
delegateTask.setVariable("revisionInformation", object.getString("revisionId"));
nextUserList.add(object.getString("revisionId"));
}
prcName += "-政策课题组入会流程-修订入会信息";
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
@@ -68,17 +79,6 @@ public class PGREPresidentApprovalAfter implements TaskListener {
}
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);
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java
+12 -10
View File
@@ -42,6 +42,14 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
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="";
List<String> nextUserList = new ArrayList();
if ("1".equals(object.getString("fgfzj"))) {
@@ -50,14 +58,17 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
delegateTask.setVariable("presidentApproval", object.getString("presidentId"));
nextUserList.add(object.getString("presidentId"));
}
prcName = standName + "-政策课题组入会流程-公司副总批准";
} else if ("0".equals(object.getString("fgfzj"))) {
delegateTask.setVariable("fgfzj", "0");
if (StringUtils.isNotBlank(object.getString("revisionId"))){
delegateTask.setVariable("revisionInformation", object.getString("revisionId"));
nextUserList.add(object.getString("revisionId"));
}
prcName = standName + "-政策课题组入会流程-修订入会信息";
}else{
delegateTask.setVariable("fgfzj", "2");
prcName = standName + "-政策课题组入会流程";
}
// 存储当前节点意见
@@ -76,15 +87,6 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
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());
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java
+13 -10
View File
@@ -42,6 +42,16 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
//截止时间 流程描述 创建人
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="";
List<String> nextUserList = new ArrayList();
@@ -52,12 +62,14 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
delegateTask.setVariable("inspectorApproval", object.getString("inspectorId"));
nextUserList.add(object.getString("inspectorId"));
}
prcName = standName + "-政策课题组入会流程-法规认证部副总监批准";
}else{
delegateTask.setVariable("fgfbz","0");
if (StringUtils.isNotBlank(object.getString("revisionId"))){
delegateTask.setVariable("revisionInformation", object.getString("revisionId"));
nextUserList.add(object.getString("revisionId"));
}
prcName = standName + "-政策课题组入会流程-修订入会信息";
}
// 存储当前节点意见
@@ -78,16 +90,7 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
//截止时间 流程描述 创建人
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());
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class PRGEStartAfter implements TaskListener {
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
prcName = standName + "-标准化活动入会流程-副部长审核";
prcName = standName + "-标准化活动入会流程-法规认证部副部长审核";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class RevisonInformationAfter implements TaskListener {
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
prcName = standName + "-政策课题组入会流程-";
prcName = standName + "-政策课题组入会流程-法规认证部副部长审核";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());