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

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

Browse Source
This commit is contained in:
koweiyi
2021-10-27 15:47:38 +08:00
parent eb05c2f40d
commit cd93e51a8e
13 changed files with 66 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java
+4 -8
View File
@@ -37,25 +37,21 @@ public class ApprovalAfter implements TaskListener {
delegateTask.setVariable("objectJson",object); delegateTask.setVariable("objectJson",object);
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser"); String user = delegateTask.getVariable("createUser", String.class);
delegateTask.setVariable("createUser",user); String username = delegateTask.getVariable("createUserName", String.class);
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName=""; String prcName="";
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
if("1".equals(object.getString("shyFlag"))){ if("1".equals(object.getString("shyFlag"))){
delegateTask.setVariable("shyFlag", "1"); delegateTask.setVariable("shyFlag", "1");
prcName = standName + "-政策课题组会后流程"; prcName = "政策课题组会后流程";
}else{ }else{
delegateTask.setVariable("shyFlag", "0"); delegateTask.setVariable("shyFlag", "0");
if(StringUtils.isNotBlank(object.getString("revisionId"))){ if(StringUtils.isNotBlank(object.getString("revisionId"))){
delegateTask.setVariable("revision", object.getString("revisionId")); delegateTask.setVariable("revision", object.getString("revisionId"));
nextUserList.add(object.getString("revisionId")); nextUserList.add(object.getString("revisionId"));
prcName = standName + "-政策课题组会后流程-申请人修订申请信息"; prcName = "政策课题组会后流程-申请人修订申请信息";
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java
+9 -7
View File
@@ -44,14 +44,16 @@ public class InputInformationAfter implements TaskListener {
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser"); // String user = object.getString("prcCreateUser");
delegateTask.setVariable("createUser",user); // delegateTask.setVariable("createUser",user);
String username = object.getString("prcCreateUserName"); // String username = object.getString("prcCreateUserName");
delegateTask.setVariable("createUserName",username); // delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName"); // String standName = object.getString("listName");
delegateTask.setVariable("listName",standName); // delegateTask.setVariable("listName",standName);
String user = delegateTask.getVariable("createUser", String.class);
String username = delegateTask.getVariable("createUserName", String.class);
String prcName=""; String prcName="";
prcName = standName + "-政策课题组会后流程-审核员批准"; prcName = "政策课题组会后流程-审核员批准";
// if(object.getString("signFlag").equals("1")) { // if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签"; // prcName = standName + "-标准法规清单申请-会签";
// }else { // }else {
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java
+3 -5
View File
@@ -44,13 +44,11 @@ public class PRGAMStartAfter implements TaskListener {
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); // 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); delegateTask.setVariable("createUser",user);
String username = object.getString("prcCreateUserName"); String username = object.getString("revisionIdName");
delegateTask.setVariable("createUserName",username); delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName"); String prcName= "政策课题组会后流程-申请人填写表单";
delegateTask.setVariable("listName",standName);
String prcName=standName + "-政策课题组会后流程-申请人填写表单";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java
+3 -7
View File
@@ -44,13 +44,9 @@ public class RevisionInformationAfter implements TaskListener {
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser"); String user = delegateTask.getVariable("createUser",String.class);
delegateTask.setVariable("createUser",user); String username = delegateTask.getVariable("createUserName",String.class);
String username = object.getString("prcCreateUserName"); String prcName="政策课题组会后流程-审核员审核";
delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
// if(object.getString("signFlag").equals("1")) { // if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签"; // prcName = standName + "-标准法规清单申请-会签";
// }else { // }else {
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java
+9 -9
View File
@@ -37,12 +37,12 @@ public class MinisterApprovalAfter implements TaskListener {
delegateTask.setVariable("objectJson",object); delegateTask.setVariable("objectJson",object);
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser"); // String user = object.getString("prcCreateUser");
delegateTask.setVariable("createUser",user); // delegateTask.setVariable("createUser",user);
String username = object.getString("prcCreateUserName"); // String username = object.getString("prcCreateUserName");
delegateTask.setVariable("createUserName",username); // delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName"); String user = delegateTask.getVariable("createUser",String.class);
delegateTask.setVariable("listName",standName); String username = delegateTask.getVariable("createUserName",String.class);
String prcName=""; String prcName="";
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
@@ -52,18 +52,18 @@ public class MinisterApprovalAfter implements TaskListener {
if (StringUtils.isNotBlank(object.getString("presidentId"))){ if (StringUtils.isNotBlank(object.getString("presidentId"))){
nextUserList.add(object.getString("presidentId")); nextUserList.add(object.getString("presidentId"));
delegateTask.setVariable("presidentApproval", object.getString("presidentId")); delegateTask.setVariable("presidentApproval", object.getString("presidentId"));
prcName = standName + "-政策课题组参会流程-公司副总批准"; prcName = "政策课题组参会流程-公司副总批准";
} }
}else if ("0".equals(object.getString("fgfbz"))){ }else if ("0".equals(object.getString("fgfbz"))){
delegateTask.setVariable("fgfbz", "0"); delegateTask.setVariable("fgfbz", "0");
if (StringUtils.isNotBlank(object.getString("revisionId"))){ if (StringUtils.isNotBlank(object.getString("revisionId"))){
nextUserList.add(object.getString("revisionId")); nextUserList.add(object.getString("revisionId"));
delegateTask.setVariable("revision", object.getString("revisionId")); delegateTask.setVariable("revision", object.getString("revisionId"));
prcName = standName + "-政策课题组参会流程-修订参会信息"; prcName = "政策课题组参会流程-修订参会信息";
} }
}else{ }else{
delegateTask.setVariable("fgfbz", "2"); delegateTask.setVariable("fgfbz", "2");
prcName = standName + "-政策课题组参会流程"; prcName = "政策课题组参会流程";
} }
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java
+4 -6
View File
@@ -44,18 +44,16 @@ public class PRGAMStartAfter implements TaskListener {
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); // 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); delegateTask.setVariable("createUser",user);
String username = object.getString("prcCreateUserName"); String username = object.getString("revisionIdName");
delegateTask.setVariable("createUserName",username); delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName = ""; String prcName = "";
prcName= standName + "-政策课题组参会流程-法规认证部副部长审核"; prcName= "政策课题组参会流程-法规认证部副部长审核";
// if(object.getString("signFlag").equals("1")) { // if(object.getString("signFlag").equals("1")) {
// prcName = standName + "-标准法规清单申请-会签"; // prcName = standName + "-标准法规清单申请-会签";
// }else { // }else {
// prcName = standName + "-标准法规清单申请-经理审批"; // prcName = standName + "标准法规清单申请-经理审批";
// } // }
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java
+6 -8
View File
@@ -38,25 +38,23 @@ public class PresidentApprovalAfter implements TaskListener {
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser"); // String user = object.getString("prcCreateUser");
delegateTask.setVariable("createUser",user); // delegateTask.setVariable("createUser",user);
String username = object.getString("prcCreateUserName"); String user = delegateTask.getVariable("createUser",String.class);
delegateTask.setVariable("createUserName",username); String username = delegateTask.getVariable("createUserName",String.class);
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName=""; String prcName="";
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
if("1".equals(object.getString("gsfz"))){ if("1".equals(object.getString("gsfz"))){
delegateTask.setVariable("gsfz", "1"); delegateTask.setVariable("gsfz", "1");
prcName = standName + "-政策课题组参会流程"; prcName = "政策课题组参会流程";
}else{ }else{
delegateTask.setVariable("gsfz", "0"); delegateTask.setVariable("gsfz", "0");
if (StringUtils.isNotBlank(object.getString("revisionId"))){ if (StringUtils.isNotBlank(object.getString("revisionId"))){
nextUserList.add(object.getString("revisionId")); nextUserList.add(object.getString("revisionId"));
delegateTask.setVariable("revision", object.getString("revisionId")); delegateTask.setVariable("revision", object.getString("revisionId"));
prcName = standName + "-政策课题组参会流程-修订参会信息"; prcName = "政策课题组参会流程-修订参会信息";
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java
+9 -7
View File
@@ -37,19 +37,21 @@ public class RevisionInformationAfter implements TaskListener {
delegateTask.setVariable("objectJson",object); delegateTask.setVariable("objectJson",object);
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人
// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
String user = object.getString("prcCreateUser"); // String user = object.getString("prcCreateUser");
delegateTask.setVariable("createUser",user); // delegateTask.setVariable("createUser",user);
String username = object.getString("prcCreateUserName"); // String username = object.getString("prcCreateUserName");
delegateTask.setVariable("createUserName",username); // delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName"); // String standName = object.getString("listName");
delegateTask.setVariable("listName",standName); // delegateTask.setVariable("listName",standName);
String user = delegateTask.getVariable("createUser",String.class);
String username = delegateTask.getVariable("createUserName",String.class);
String prcName=""; String prcName="";
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
if (StringUtils.isNotBlank(object.getString("ministerId"))){ if (StringUtils.isNotBlank(object.getString("ministerId"))){
nextUserList.add(object.getString("ministerId")); nextUserList.add(object.getString("ministerId"));
delegateTask.setVariable("ministerApproval", object.getString("ministerId")); delegateTask.setVariable("ministerApproval", object.getString("ministerId"));
prcName = standName + "-政策课题组参会流程-法规认证部副部长审核"; prcName = "政策课题组参会流程-法规认证部副部长审核";
} }
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java
+6 -10
View File
@@ -41,28 +41,24 @@ public class PGREPresidentApprovalAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object); 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 user = object.getString("prcCreateUser"); String username = delegateTask.getVariable("createUserName", String.class);
delegateTask.setVariable("createUser",user); String prcName="";
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(); List<String> nextUserList = new ArrayList();
if ("1".equals(object.getString("gsfz"))) { if ("1".equals(object.getString("gsfz"))) {
delegateTask.setVariable("gsfz", "1"); delegateTask.setVariable("gsfz", "1");
prcName += "-政策课题组入会流程"; prcName = "政策课题组入会流程";
} else { } else {
delegateTask.setVariable("gsfz", "0"); delegateTask.setVariable("gsfz", "0");
if (StringUtils.isNotBlank(object.getString("revisionId"))) { if (StringUtils.isNotBlank(object.getString("revisionId"))) {
delegateTask.setVariable("revisionInformation", object.getString("revisionId")); delegateTask.setVariable("revisionInformation", object.getString("revisionId"));
nextUserList.add(object.getString("revisionId")); nextUserList.add(object.getString("revisionId"));
} }
prcName += "-政策课题组入会流程-修订入会信息"; prcName = "政策课题组入会流程-修订入会信息";
} }
// 存储当前节点意见 // 存储当前节点意见
if (null != object.getString("commentText")) { if (null != object.getString("commentText")) {
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java
+5 -10
View File
@@ -42,13 +42,8 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object); 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 user = object.getString("prcCreateUser"); String username = delegateTask.getVariable("createUserName", String.class);
delegateTask.setVariable("createUser",user);
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName=""; String prcName="";
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
@@ -58,17 +53,17 @@ public class PRGEInspectorApprovalAfter implements TaskListener {
delegateTask.setVariable("presidentApproval", object.getString("presidentId")); delegateTask.setVariable("presidentApproval", object.getString("presidentId"));
nextUserList.add(object.getString("presidentId")); nextUserList.add(object.getString("presidentId"));
} }
prcName = standName + "-政策课题组入会流程-公司副总批准"; prcName = "政策课题组入会流程-公司副总批准";
} else if ("0".equals(object.getString("fgfzj"))) { } else if ("0".equals(object.getString("fgfzj"))) {
delegateTask.setVariable("fgfzj", "0"); delegateTask.setVariable("fgfzj", "0");
if (StringUtils.isNotBlank(object.getString("revisionId"))){ if (StringUtils.isNotBlank(object.getString("revisionId"))){
delegateTask.setVariable("revisionInformation", object.getString("revisionId")); delegateTask.setVariable("revisionInformation", object.getString("revisionId"));
nextUserList.add(object.getString("revisionId")); nextUserList.add(object.getString("revisionId"));
} }
prcName = standName + "-政策课题组入会流程-修订入会信息"; prcName = "政策课题组入会流程-修订入会信息";
}else{ }else{
delegateTask.setVariable("fgfzj", "2"); delegateTask.setVariable("fgfzj", "2");
prcName = standName + "-政策课题组入会流程"; prcName = "政策课题组入会流程";
} }
// 存储当前节点意见 // 存储当前节点意见
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java
+4 -9
View File
@@ -43,13 +43,8 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object); 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 user = object.getString("prcCreateUser"); String username = delegateTask.getVariable("createUserName",String.class);
delegateTask.setVariable("createUser",user);
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName=""; String prcName="";
@@ -62,14 +57,14 @@ public class PRGEMinisterConfirmAfter implements TaskListener {
delegateTask.setVariable("inspectorApproval", object.getString("inspectorId")); delegateTask.setVariable("inspectorApproval", object.getString("inspectorId"));
nextUserList.add(object.getString("inspectorId")); nextUserList.add(object.getString("inspectorId"));
} }
prcName = standName + "-政策课题组入会流程-法规认证部副总监批准"; prcName = "政策课题组入会流程-法规认证部副总监批准";
}else{ }else{
delegateTask.setVariable("fgfbz","0"); delegateTask.setVariable("fgfbz","0");
if (StringUtils.isNotBlank(object.getString("revisionId"))){ if (StringUtils.isNotBlank(object.getString("revisionId"))){
delegateTask.setVariable("revisionInformation", object.getString("revisionId")); delegateTask.setVariable("revisionInformation", object.getString("revisionId"));
nextUserList.add(object.getString("revisionId")); nextUserList.add(object.getString("revisionId"));
} }
prcName = standName + "-政策课题组入会流程-修订入会信息"; prcName = "政策课题组入会流程-修订入会信息";
} }
// 存储当前节点意见 // 存储当前节点意见
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java
+1 -3
View File
@@ -57,10 +57,8 @@ public class PRGEStartAfter implements TaskListener {
delegateTask.setVariable("createUser",user); delegateTask.setVariable("createUser",user);
String username = object.getString("revisionIdName"); String username = object.getString("revisionIdName");
delegateTask.setVariable("createUserName",username); delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName=""; String prcName="";
prcName = standName + "-标准化活动入会流程-法规认证部副部长审核"; prcName = "标准化活动入会流程-法规认证部副部长审核";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java
+3 -8
View File
@@ -50,15 +50,10 @@ public class RevisonInformationAfter implements TaskListener {
// delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); // delegateTask.setVariable("ministerConfirm", object.getString("ministerId"));
} }
String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("createUser", String.class);
String user = object.getString("prcCreateUser"); String username = delegateTask.getVariable("createUserName", String.class);
delegateTask.setVariable("createUser",user);
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("createUserName",username);
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName=""; String prcName="";
prcName = standName + "-政策课题组入会流程-法规认证部副部长审核"; prcName = "政策课题组入会流程-法规认证部副部长审核";
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());