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:
yuezhihang
2021-10-29 14:06:49 +08:00
parent 98055a97e3
commit dd52ea79a9
21 changed files with 60 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+11 -2
View File
@@ -1964,7 +1964,12 @@ public class TodoTaskController extends BaseAction {
queryWrapper1.eq("P_ID",busProcessName.getPrcId());
queryWrapper1.eq("TASK_ID",task.getId());
BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
busProcessName.setPrcName(busProcessNew.getPrcName());
if (null!=busProcessNew.getPrcName()){
busProcessName.setPrcName(busProcessNew.getPrcName());
}else {
busProcessNew.setPrcName("");
}
}
}
if (assignee != null && !assignee.equals("")) {
@@ -2080,7 +2085,11 @@ public class TodoTaskController extends BaseAction {
queryWrapper1.eq("P_ID",busProcessName.getPrcId());
queryWrapper1.eq("TASK_ID",task.getId());
BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1);
busProcessName.setPrcName(busProcessNew.getPrcName());
if (null!=busProcessNew.getPrcName()){
busProcessName.setPrcName(busProcessNew.getPrcName());
}else {
busProcessNew.setPrcName("");
}
}
}
if (assignee != null && !assignee.equals("")) {
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java
+8 -11
View File
@@ -14,7 +14,9 @@ import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class ApprovalAfter implements TaskListener {
@@ -26,7 +28,6 @@ public class ApprovalAfter implements TaskListener {
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
@@ -36,7 +37,7 @@ public class ApprovalAfter 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 = delegateTask.getVariable("createUser", String.class);
String username = delegateTask.getVariable("createUserName", String.class);
String prcName="";
@@ -56,17 +57,14 @@ public class ApprovalAfter implements TaskListener {
}
// if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签";
// }else {
// prcName = standName + "-标准法规清单申请-经理审批";
// }
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
if("1".equals(object.getString("shyFlag"))){
one1.setOverTime(OVERTIME);
}
one1.setPrcType("19");
one1.setPrcName(prcName);
one1.setCreatUser(user);
@@ -74,7 +72,6 @@ public class ApprovalAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
// 存储当前节点意见
if (null!=object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -106,7 +103,7 @@ public class ApprovalAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("业务经理审批");
busProcessNewNext.setTaskInfo("政策课题组会后流程-结束");
busProcessNewNext.setUserId(object.getString("jlUserId"));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class ApprovalBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("policyResearchGroupEnrollment2?prcType=19");
one1.setLink("zchhStep3?prcType=19");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java
+1 -26
View File
@@ -26,7 +26,6 @@ public class InputInformationAfter implements TaskListener {
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
@@ -43,22 +42,9 @@ public class InputInformationAfter 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 user = delegateTask.getVariable("createUser", String.class);
String username = delegateTask.getVariable("createUserName", String.class);
String prcName="";
prcName = "政策课题组会后流程-审核员批准";
// if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签";
// }else {
// prcName = standName + "-标准法规清单申请-经理审批";
// }
String prcName = "政策课题组会后流程-审核员批准";
QueryWrapper queryWrapper2 = new QueryWrapper();
@@ -72,7 +58,6 @@ public class InputInformationAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
// 存储当前节点意见
if (null!=object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -98,16 +83,6 @@ public class InputInformationAfter 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/policyResearchGroupAfterMeeting/InputInformationBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class InputInformationBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("policyResearchGroupEnrollment2?prcType=19");
one1.setLink("zchhStep2?prcType=19");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java
+11 -6
View File
@@ -35,15 +35,20 @@ public class PRGAMStartAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
if(StringUtils.isNotBlank(object.getString("applicantId"))){
delegateTask.setVariable("inputInformation", object.getString("applicantId"));
nextUserList.add(object.getString("applicantId"));
}
//auto 判断流程是否是自动发起的
if ("1".equals(object.getString("auto"))){
delegateTask.setVariable("inputInformation", object.getString("revisionId"));
nextUserList.add(object.getString("revisionId"));
}
else {
if (StringUtils.isNotBlank(object.getString("applicantId"))) {
delegateTask.setVariable("inputInformation", object.getString("applicantId"));
nextUserList.add(object.getString("applicantId"));
}
}
//截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("revisionId");
delegateTask.setVariable("createUser",user);
String username = object.getString("revisionIdName");
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java
-18
View File
@@ -26,7 +26,6 @@ public class RevisionInformationAfter implements TaskListener {
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
@@ -43,15 +42,9 @@ public class RevisionInformationAfter implements TaskListener {
}
//截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("createUser",String.class);
String username = delegateTask.getVariable("createUserName",String.class);
String prcName="政策课题组会后流程-审核员审核";
// if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签";
// }else {
// prcName = standName + "-标准法规清单申请-经理审批";
// }
QueryWrapper queryWrapper2 = new QueryWrapper();
@@ -65,7 +58,6 @@ public class RevisionInformationAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
// 存储当前节点意见
if (null!=object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -91,16 +83,6 @@ public class RevisionInformationAfter 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/policyResearchGroupAfterMeeting/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("policyResearchGroupEnrollment2?prcType=19");
one1.setLink("zchhStep1?prcType=19");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java
-25
View File
@@ -26,8 +26,6 @@ public class MinisterApprovalAfter implements TaskListener {
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -36,11 +34,6 @@ public class MinisterApprovalAfter 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 user = delegateTask.getVariable("createUser",String.class);
String username = delegateTask.getVariable("createUserName",String.class);
String prcName="";
@@ -67,13 +60,6 @@ public class MinisterApprovalAfter implements TaskListener {
}
// 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);
@@ -85,7 +71,6 @@ public class MinisterApprovalAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
// 存储当前节点意见
if (null!=object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -111,16 +96,6 @@ public class MinisterApprovalAfter 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/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class MinisterApprovalBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("policyResearchGroupEnrollment2?prcType=18");
one1.setLink("zcchStep3?prcType=18");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java
-18
View File
@@ -26,8 +26,6 @@ public class PRGAMStartAfter implements TaskListener {
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -50,11 +48,6 @@ public class PRGAMStartAfter implements TaskListener {
delegateTask.setVariable("createUserName",username);
String prcName = "";
prcName= "政策课题组参会流程-法规认证部副部长审核";
// if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签";
// }else {
// prcName = standName + "标准法规清单申请-经理审批";
// }
QueryWrapper queryWrapper2 = new QueryWrapper();
@@ -68,7 +61,6 @@ public class PRGAMStartAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
// 存储当前节点意见
if (null!=object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -94,16 +86,6 @@ public class PRGAMStartAfter 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/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java
+7 -13
View File
@@ -14,7 +14,9 @@ import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class PresidentApprovalAfter implements TaskListener {
@@ -26,8 +28,6 @@ public class PresidentApprovalAfter implements TaskListener {
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -37,15 +37,11 @@ public class PresidentApprovalAfter implements TaskListener {
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 user = delegateTask.getVariable("createUser",String.class);
String username = delegateTask.getVariable("createUserName",String.class);
String prcName="";
List<String> nextUserList = new ArrayList();
if("1".equals(object.getString("gsfz"))){
delegateTask.setVariable("gsfz", "1");
prcName = "政策课题组参会流程";
@@ -59,14 +55,14 @@ public class PresidentApprovalAfter implements TaskListener {
}
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
if("1".equals(object.getString("gsfz"))){
one1.setOverTime(OVERTIME);
}
one1.setPrcType("18");
one1.setPrcName(prcName);
one1.setCreatUser(user);
@@ -74,7 +70,6 @@ public class PresidentApprovalAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
// 存储当前节点意见
if (null!=object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
queryWrapper3.eq("TASK_ID", delegateTask.getId());
@@ -106,8 +101,7 @@ public class PresidentApprovalAfter implements TaskListener {
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("业务经理审批");
busProcessNewNext.setUserId(object.getString("jlUserId"));
busProcessNewNext.setTaskInfo("政策课题组参会流程-流程结束");
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class PresidentApprovalBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("policyResearchGroupEnrollment2?prcType=18");
one1.setLink("zcchStep2?prcType=18");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java
-25
View File
@@ -36,13 +36,6 @@ public class RevisionInformationAfter 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 user = delegateTask.getVariable("createUser",String.class);
String username = delegateTask.getVariable("createUserName",String.class);
String prcName="";
@@ -55,13 +48,6 @@ public class RevisionInformationAfter implements TaskListener {
}
// 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);
@@ -73,7 +59,6 @@ public class RevisionInformationAfter implements TaskListener {
busProcessNameService.saveOrUpdate(one1);
}
// 存储当前节点意见
// 存储当前节点意见
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
@@ -88,16 +73,6 @@ public class RevisionInformationAfter 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/policyResearchGroupAttendMeeting/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("policyResearchGroupEnrollment2?prcType=18");
one1.setLink("zcchStep1-1?prcType=18");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
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=17");
one1.setLink("zcrhStep4?prcType=17");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class PRGEInspectorApprovalBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("policyResearchGroupEnrollment3?prcType=17");
one1.setLink("zcrhStep3?prcType=17");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class PRGEMinisterConfirmBefore implements TaskListener {
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("policyResearchGroupEnrollment2?prcType=17");
one1.setLink("zcrhStep2?prcType=17");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java
+1 -2
View File
@@ -52,13 +52,12 @@ public class PRGEStartAfter implements TaskListener {
//截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("revisionId");
delegateTask.setVariable("createUser",user);
String username = object.getString("revisionIdName");
delegateTask.setVariable("createUserName",username);
String prcName="";
prcName = "标准化活动入会流程-法规认证部副部长审核";
prcName = "政策课题组入会流程-法规认证部副部长审核";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
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=17");
one1.setLink("zcrhStep1-1?prcType=17");
one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1);
}
src/main/resources/mapper/datas/BusProcessNewMapper.xml
+11 -10
View File
@@ -4,24 +4,24 @@
<select id="findNoExecuteBusProcessNew"
resultType="com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew">
select BUS_PROCESS_NEW.* from BUS_PROCESS_NEW
select BUS_PROCESS_NEW.* from BUS_PROCESS_NEW
INNER JOIN ACT_HI_TASKINST on BUS_PROCESS_NEW.TASK_ID = ACT_HI_TASKINST.ID_
where BUS_PROCESS_NEW.TASK_ID in
<foreach collection="taskIds" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
and ACT_HI_TASKINST.END_TIME_ is null
and ACT_HI_TASKINST.END_TIME_ is null
</select>
<select id="findNoExecuteBusProcessNewForEnd"
resultType="com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew">
select BUS_PROCESS_NEW.* from BUS_PROCESS_NEW
select BUS_PROCESS_NEW.* from BUS_PROCESS_NEW
INNER JOIN ACT_HI_TASKINST on BUS_PROCESS_NEW.TASK_ID = ACT_HI_TASKINST.ID_
where BUS_PROCESS_NEW.TASK_ID in
<foreach collection="taskIds" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
-- and ACT_HI_TASKINST.END_TIME_ is NOT null
-- and ACT_HI_TASKINST.END_TIME_ is NOT null
</select>
<select id="queryTaskName" resultType="java.lang.String">
@@ -36,12 +36,13 @@
<select id="everyDayTenOlock" resultType="com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew">
SELECT
*
FROM
bus_process_new
WHERE
MESG -> '$.endTime' LIKE CONCAT(
'%',CONCAT(date_sub(DATE_FORMAT(NOW(), '%Y-%m-%d'),interval 1 day),'%'))
*
FROM
bus_process_new
WHERE
MESG -> '$.time2' LIKE CONCAT(
'%',
CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and TASK_INFO = '政策课题组参会流程-流程结束'
</select>
</mapper>