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-09-03 15:49:47 +08:00
parent 6999c43c2e
commit 58aac9a9d4
20 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java
+2
View File
@@ -83,6 +83,7 @@ public class DirectorSignAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
} else {
@@ -94,6 +95,7 @@ public class DirectorSignAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("工程研究总院院长批准");
busProcessNewNext.setUserId(delegateTask.getVariable("presidentUser", String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
} else {
BusProcessNew busProcessNewNext = new BusProcessNew();
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java
+1
View File
@@ -89,6 +89,7 @@ public class DockingApprovalAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser",String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java
+6 -3
View File
@@ -33,6 +33,9 @@ public class MinisterAndDockerSignAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
String standName = object.getString("cid");
String prcName = standName+"标准-标准征求意见流程";
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if("1".equals(object.getString("actionFlag"))){
delegateTask.setVariable("actionFlag",1);
@@ -44,7 +47,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师汇总填写处理意见");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busProcessNewNext.setPrcName(prcName);
QueryWrapper qw = new QueryWrapper();
qw.isNull("task_id");
List<BusProcessNew> list = busBean.list(qw);
@@ -61,8 +64,6 @@ public class MinisterAndDockerSignAfter implements TaskListener {
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");
String prcName = standName+"标准-标准征求意见流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -115,6 +116,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}else {
@@ -125,6 +127,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定");
busProcessNewNext.setUserId(delegateTask.getVariable("directorUser", String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}else{
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java
+2
View File
@@ -110,6 +110,7 @@ public class ResponUserSignAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
@@ -121,6 +122,7 @@ public class ResponUserSignAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师汇总填写处理意见");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}else {
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java
+1
View File
@@ -141,6 +141,7 @@ public class SelectResponsibleUserAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(map.get(zqa).getString("id"));
busProcessNewNext.setPrcName(prcName);
busProcessNews.add(busProcessNewNext);
}
busBean.saveBatch(busProcessNews);
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java
+1
View File
@@ -117,6 +117,7 @@ public class StartSurveyAfter implements TaskListener {
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("责任对接人选择责任人");
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class));
busBean.save(busProcessNewNext);
}
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java
+1
View File
@@ -107,6 +107,7 @@ public class UploadResearchResultAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}else{
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java
+2
View File
@@ -84,6 +84,7 @@ public class DirectorSignAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
} else {
@@ -95,6 +96,7 @@ public class DirectorSignAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("工程研究总院院长批准");
busProcessNewNext.setUserId(delegateTask.getVariable("presidentUser", String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
} else {
BusProcessNew busProcessNewNext = new BusProcessNew();
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalAfter.java
+2
View File
@@ -82,6 +82,7 @@ public class DockingApprovalAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}else{
@@ -101,6 +102,7 @@ public class DockingApprovalAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser",String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignAfter.java
+4
View File
@@ -109,6 +109,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
} else {
@@ -119,6 +120,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定");
busProcessNewNext.setUserId(delegateTask.getVariable("directorUser", String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
} else {
@@ -129,6 +131,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}else {
@@ -141,6 +144,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setPrcName(prcName);
busProcessNewNext.setUserId(delegateTask.getVariable("startUser",String.class));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
delegateTask.setVariable("task3Count",0);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java
+1
View File
@@ -108,6 +108,7 @@ public class ResponUserSignAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/StartSurveyAfter.java
+1
View File
@@ -108,6 +108,7 @@ public class StartSurveyAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}else{
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java
+13 -8
View File
@@ -44,6 +44,14 @@ public class PEPffresPersonAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
String prcName = "";
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)+"-标准项目合规评估-合规性评估";
}
List<String> nextUserList = new ArrayList();
if (StringUtils.isNotBlank(object.getString("fenFlag"))) {
if ("2".equals(object.getString("fenFlag"))) {
@@ -70,6 +78,7 @@ public class PEPffresPersonAfter implements TaskListener {
busProcessNewNext.setCommitText(object.getString("commentText"));
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(String.valueOf(delegateTask.getVariable("workPeople")));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
@@ -77,12 +86,7 @@ public class PEPffresPersonAfter implements TaskListener {
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = delegateTask.getVariable("prcCreateUser", String.class);
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = "";
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)+"-标准项目合规评估-合规性评估";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -109,12 +113,12 @@ public class PEPffresPersonAfter implements TaskListener {
}
if (String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size()))) {
oneStep1(delegateTask, busBean, nextUserList);
oneStep1(delegateTask, busBean, nextUserList,prcName);
}
}
private void oneStep1(DelegateTask delegateTask, IBusProcessNewService busBean, List<String> nextUserList) {
private void oneStep1(DelegateTask delegateTask, IBusProcessNewService busBean, List<String> nextUserList,String prcName) {
//中间对象
List<String> CPX = new ArrayList<>();
Map<String, List<BusProcessNew>> map = new HashMap<>();
@@ -161,6 +165,7 @@ public class PEPffresPersonAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(cp);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
//赋值 节点
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java
+1
View File
@@ -99,6 +99,7 @@ public class ApplyApplicantAfter implements TaskListener{
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(nextUser);
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
}
}
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java
+2
View File
@@ -65,6 +65,7 @@ public class CountersignAfter implements TaskListener{
standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber"));
}
String prcName = standAllName+"-"+standName+"标准入库";
delegateTask.setVariable("prcs",prcName);
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -97,6 +98,7 @@ public class CountersignAfter implements TaskListener{
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(nextUser);
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
}
}
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java
+1
View File
@@ -46,6 +46,7 @@ public class ManagerApproveAfter implements TaskListener {
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("applyUpdUserId"));
busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class));
busBean.save(busProcessNew);
func1(delegateTask, busBean, object, "1");
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPAfter.java
+1
View File
@@ -84,6 +84,7 @@ public class CountersignSRPAfter implements TaskListener{
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(nextUser);
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
}
}
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPApplyApplicantAfter.java
+1
View File
@@ -83,6 +83,7 @@ public class SRPApplyApplicantAfter implements TaskListener{
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(nextUser);
busProcessNew.setPrcName(prcName);
busBean.save(busProcessNew);
}
}
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java
+1
View File
@@ -55,6 +55,7 @@ public class SRPManagerApproveAfter implements TaskListener{
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("applyUpdUserId"));
busProcessNew.setPrcName(delegateTask.getVariable("listName",String.class)+"-标准法规清单-修订");
busBean.save(busProcessNew);
func1(delegateTask, busBean, object,"1");
src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPstartAfter.java
+2
View File
@@ -131,6 +131,7 @@ public class SRPstartAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}else {
@@ -141,6 +142,7 @@ public class SRPstartAfter implements TaskListener {
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo("业务经理审批");
busProcessNewNext.setUserId(object.getString("jlUserId"));
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}