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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-05-18 09:33:52 +08:00
parent f51b8c15b1 f0d426a40f
commit 0e2a2567fc
26 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignAfter.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class DirectorSignAfter implements TaskListener {
String user = delegateTask.getVariable("startId",String.class);
String username = delegateTask.getVariable("startName",String.class);
String standName = delegateTask.getVariable("title",String.class);
String prcName = standName+"-标准调研流程";
String 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/StandardSurvey/DockingApprovalAfter.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class DockingApprovalAfter implements TaskListener {
String user = delegateTask.getVariable("startId",String.class);
String username = delegateTask.getVariable("startName",String.class);
String standName = delegateTask.getVariable("title",String.class);
String prcName = standName+"-标准调研流程";
String 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/StandardSurvey/MinisterAndDockerSignAfter.java
+3 -3
View File
@@ -49,7 +49,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
String user = delegateTask.getVariable("startId",String.class);
String username = delegateTask.getVariable("startName",String.class);
String standName = delegateTask.getVariable("title",String.class);
String prcName = standName+"-标准调研流程";
String prcName = standName;
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -106,9 +106,9 @@ public class MinisterAndDockerSignAfter implements TaskListener {
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定");
busProcessNewNext.setTaskInfo("审定");
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
// busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignAfter.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class PresidentSignAfter implements TaskListener {
String user = delegateTask.getVariable("startId",String.class);
String username = delegateTask.getVariable("startName",String.class);
String standName = delegateTask.getVariable("title",String.class);
String prcName = standName+"-标准调研流程";
String 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/StandardSurvey/ResponUserSignAfter.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class ResponUserSignAfter implements TaskListener {
String user = delegateTask.getVariable("startId", String.class);
String username = delegateTask.getVariable("startName", String.class);
String standName = delegateTask.getVariable("title", String.class);
String prcName = standName + "-标准调研流程";
String 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/StandardSurvey/SelectResponsibleUserAfter.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class SelectResponsibleUserAfter implements TaskListener {
String user = delegateTask.getVariable("startId",String.class);
String username = delegateTask.getVariable("startName",String.class);
String standName = delegateTask.getVariable("title",String.class);
String prcName = standName+"-标准调研流程";
String 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/StandardSurvey/SummarySurveyAfter.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class SummarySurveyAfter implements TaskListener {
String user = delegateTask.getVariable("startId",String.class);
String username = delegateTask.getVariable("startName",String.class);
String standName = delegateTask.getVariable("title",String.class);
String prcName = standName+"-标准调研流程";
String 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/StandardSurvey/UploadResearchResultAfter.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class UploadResearchResultAfter implements TaskListener {
String user = delegateTask.getVariable("startId",String.class);
String username = delegateTask.getVariable("startName",String.class);
String standName = delegateTask.getVariable("title",String.class);
String prcName = standName+"-标准调研流程";
String 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/bussFs/BLApplicantAfter.java
+2 -2
View File
@@ -46,8 +46,8 @@ public class BLApplicantAfter implements TaskListener{
String username = object.getString("prcCreateUserName");
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standCode"))){
prcName = object.getString("standCode")+"-"+object.getString("standName") + "-企标复审";
}else {
prcName = "企标复审";
}
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs2After.java
+2 -2
View File
@@ -54,8 +54,8 @@ public class BussFs2After implements TaskListener{
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standCode"))){
prcName = object.getString("standCode")+"-"+object.getString("standName") + "-企标复审";
}else {
prcName = "企标复审";
}
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFs3After.java
+2 -2
View File
@@ -59,8 +59,8 @@ public class BussFs3After implements TaskListener{
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standCode"))){
prcName = object.getString("standCode")+"-"+object.getString("standName") + "-企标复审";
}else {
prcName = "企标复审";
}
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsC2After.java
+2 -2
View File
@@ -52,8 +52,8 @@ public class BussFsC2After implements TaskListener{
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standCode"))){
prcName = object.getString("standCode")+"-"+object.getString("standName") + "-企标复审";
}else {
prcName = "企标复审";
}
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub1After.java
+2 -2
View File
@@ -53,8 +53,8 @@ public class BussFsSub1After implements TaskListener{
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standCode"))){
prcName = object.getString("standCode")+"-"+object.getString("standName") + "-企标复审";
}else {
prcName = "企标复审";
}
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java
+2 -2
View File
@@ -55,8 +55,8 @@ public class BussFsSub2After implements TaskListener{
String username = object.getString("prcCreateUserName");
// object.getString("standName")
String prcName = "";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standSort"))){
prcName = object.getString("standSort")+"-"+object.getString("standName") + "-企标复审";
if(StringUtils.isNotBlank(object.getString("standName")) && StringUtils.isNotBlank(object.getString("standCode"))){
prcName = object.getString("standCode")+"-"+object.getString("standName") + "-企标复审";
}else {
prcName = "企标复审";
}
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC3After.java
+3 -4
View File
@@ -43,12 +43,11 @@ public class BussLibraryC3After implements TaskListener{
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one = list.get(0);
JSONObject object = JSONObject.parseObject(one.getMesg());
List<String> nextUserList = new ArrayList();
if(StringUtils.isNotBlank(object.getString("bzhUserId"))){
delegateTask.setVariable("bzhUserId",object.getString("bzhUserId"));
nextUserList.add(object.getString("bzhUserId"));
if(StringUtils.isNotBlank(objectNew.getString("bzhUserId"))){
delegateTask.setVariable("bzhUserId",objectNew.getString("bzhUserId"));
nextUserList.add(objectNew.getString("bzhUserId"));
}else {
throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
}
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibraryC6After.java
+3 -4
View File
@@ -43,12 +43,11 @@ public class BussLibraryC6After implements TaskListener{
List<BusProcessNew> list = busBean.list(queryWrapper1);
if(!list.isEmpty()){
BusProcessNew one = list.get(0);
JSONObject object = JSONObject.parseObject(one.getMesg());
List<String> nextUserList = new ArrayList();
if(StringUtils.isNotBlank(object.getString("fggcsUserId"))){
delegateTask.setVariable("fggcsUserId",object.getString("fggcsUserId"));
nextUserList.add(object.getString("fggcsUserId"));
if(StringUtils.isNotBlank(objectNew.getString("fggcsUserId"))){
delegateTask.setVariable("fggcsUserId",objectNew.getString("fggcsUserId"));
nextUserList.add(objectNew.getString("fggcsUserId"));
}else {
throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
}
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step2After.java
+2 -2
View File
@@ -74,9 +74,9 @@ public class Step2After implements TaskListener {
String username = delegateTask.getVariable("prcCreateUserName", String.class);
String prcName = "";
if ("0".equals(object.getString("stepFlag"))) {
prcName = delegateTask.getVariable("stands", String.class) + "-标准项目合规评估-项目分发(项目群负责人/标准法规工程师)";
prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准";
}else {
prcName = delegateTask.getVariable("stands", String.class) + "-标准项目合规评估-整改";
prcName = object.getString("standNumber")+"-"+object.getString("standName") + "-合规标准";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class ApplyApplicantAfter implements TaskListener{
/**
* 流程名称 标准号+"标准入库" + 下一个节点名称
*/
String prcName = standAllName+"-"+standName+"标准入库"+" " + "经理人审批";
String prcName = standAllName+"-"+standName+"-入库";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java
+1 -1
View File
@@ -65,7 +65,7 @@ public class CountersignAfter implements TaskListener{
}else {
standAllName = verifyObj(object.getString("standSort")) + " " + verifyObj(object.getString("standNumber"));
}
String prcName = standAllName+"-"+standName+"标准入库";
String prcName = standAllName+"-"+standName+"-入库";
delegateTask.setVariable("prcs",prcName);
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class ManagerApproveAfter implements TaskListener {
/**
* 流程名称 标准号+"标准入库" + 下一个节点名称
*/
String prcName = standAllName+"-"+standName+"标准入库"+" " + "申请人修订";
String prcName = standAllName+"-"+standName+"-批准";
busProcessNew.setPrcName(prcName);
// busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class));
busBean.save(busProcessNew);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class DeptApplayAfter implements TaskListener{
List<String> nextUserList = new ArrayList();
String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程";
String prcName = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读";
//部长进行审批（1：通过）
if (object.getString("gcApplyFlag").equals("1")) {
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class DeptZrAfter implements TaskListener{
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程-填写解读分析";
String prcName = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class EngineerApplayAfter implements TaskListener{
List<String> nextUserList = new ArrayList();
String prcName = delegateTask.getVariable("titles",String.class) + "-标准解读流程";
String prcName = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读";
//工程师是否要进行审核
if (object.getString("zrApplyFlag").equals("1")) {
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class ExpainAfter implements TaskListener{
String user = object.getString("applyUserId");
String username = object.getString("applyUserIdName");
String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程-责任人审核";
String prcName = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+1 -1
View File
@@ -68,7 +68,7 @@ public class ResolveAfter implements TaskListener{
String title=object.getString("itemsNum1")+"-"+object.getString("itemsName1");
delegateTask.setVariable("titles",title);
// String prcName = title+"-标准解读流程-选择执行人";
String prcName = title+"-标准解读流程-解读";
String prcName = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读";
String prcName1 = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class ZrApplayAfter implements TaskListener{
List<String> nextUserList = new ArrayList();
String prcName = delegateTask.getVariable("titles",String.class)+"-标准解读流程";
String prcName = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读";
//责任人是否要进行审核
if(object.getString("resolveFlag").equals("1")){
delegateTask.setVariable("zrFlag",1);