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

zcr:参会流程整改 + 入会优化 + prcName更改

Browse Source
This commit is contained in:
Kevin
2021-11-02 10:11:24 +08:00
parent 7169f3a254
commit 311c27e8b2
29 changed files with 144 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class AutoStartBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=22";
String link = "bzhhStep?prcType=22";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class DirectorVerifyBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=22";
String link = "bzhhStep?prcType=22";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class MemberUploadInfoBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=22";
String link = "bzhhStep?prcType=22";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java
+29 -64
View File
@@ -30,89 +30,57 @@ public class ChargeVerifyAfter implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
//流程信息
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());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动参会流程-";
JSONObject sum = new JSONObject();
if(null == delegateTask.getVariable("membersSumJSON")){
delegateTask.setVariable("membersSumJSON",sum);
}
Integer count = 0;
if(null == delegateTask.getVariable("chargePassCount")){
delegateTask.setVariable("chargePassCount",count);
}
JSONArray objects = new JSONArray();
if(null == delegateTask.getVariable("chargePassList")) {
delegateTask.setVariable("chargePassList", objects);
}
// 审批
//防止重复审批同一对象
List<String> idList = new ArrayList<>();
if(null == delegateTask.getVariable("chargeIdList")){
delegateTask.setVariable("chargeIdList", idList);
}
int rat = 0;
idList = delegateTask.getVariable("chargeIdList",List.class);
if(!idList.isEmpty()){
for(String a : idList){
if(a.equals(object.getString("member"))){
rat = 1;
break;
}
if("1".equals(object.getString("passFlag"))){//通过
JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole");
sum = delegateTask.getVariable("membersSumJSON",JSONObject.class);
if(sum.isEmpty()){
sum = object;
delegateTask.setVariable("membersSumJSON",sum);
}else {
JSONObject o1 = sum.getJSONObject("rh_pageData");
JSONObject o = os.getJSONObject(0);
JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole");
os1.add(o);
o1.put("myPartRole",os1);
sum.put("rh_pageData",o1);
delegateTask.setVariable("membersSumJSON",sum);
}
}
if(rat == 0){
if("1".equals(object.getString("passFlag"))){//通过
JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole");
sum = delegateTask.getVariable("membersSumJSON",JSONObject.class);
if(sum.isEmpty()){
sum = object;
delegateTask.setVariable("membersSumJSON",sum);
}else {
JSONObject o1 = sum.getJSONObject("rh_pageData");
JSONObject o = os.getJSONObject(0);
JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole");
os1.add(o);
o1.put("myPartRole",os1);
sum.put("rh_pageData",o1);
delegateTask.setVariable("membersSumJSON",sum);
count = delegateTask.getVariable("chargePassCount",Integer.class);
delegateTask.setVariable("chargePassCount",count + 1);
delegateTask.setVariable("pass2",1);//排他通道
System.out.println(delegateTask.getVariable("chargePassList"));
if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
prcName = prcName + "标准法规工程师修订";
if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
nextUserList.add(object.getString("engineerSum"));
delegateTask.setVariable("engineerSum", object.getString("engineerSum"));
}
idList.add(object.getString("member"));
delegateTask.setVariable("chargeIdList",idList);
delegateTask.setVariable("pass2",1);//排他通道
count = delegateTask.getVariable("chargePassCount",Integer.class);
delegateTask.setVariable("chargePassCount",count + 1);
objects = delegateTask.getVariable("chargePassList",JSONArray.class);
objects.add(object);
delegateTask.setVariable("chargePassList",objects);
System.out.println(delegateTask.getVariable("chargePassList"));
if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
nextUserList.add(object.getString("engineerSum"));
delegateTask.setVariable("engineerSum", object.getString("engineerSum"));
}
}
}else{
delegateTask.setVariable("pass2",0);//排他通道
nextUserList.add(object.getString("member"));
}
}else{
throw new ActivitiException("审批过了");
prcName = prcName + "参会代表填写参会信息表";
delegateTask.setVariable("pass2",0);//排他通道
nextUserList.add(object.getString("member"));
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
QueryWrapper queryWrapper3 = new QueryWrapper();
@@ -127,8 +95,6 @@ public class ChargeVerifyAfter implements TaskListener {
}
}
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
delegateTask.setVariable("createUser", user);
@@ -136,7 +102,6 @@ public class ChargeVerifyAfter implements TaskListener {
delegateTask.setVariable("createUserName", username);
String standName = object.getString("listName");
delegateTask.setVariable("listName", standName);
String prcName ="标准化活动参会流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=21";
String link = "bzchStep?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java
+20 -38
View File
@@ -30,59 +30,42 @@ public class DirectorChooseAfter 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());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
System.out.println("后置搭建完成");
//如果 他是通过 passFlag==1
List<String> passMemberList = new ArrayList<>();
if(null == delegateTask.getVariable("memberList")){
delegateTask.setVariable("memberList", passMemberList);
}
String prcName = "标准化活动参会流程-";
//防止重复审批同一对象
List<String> idList = new ArrayList<>();
if(null == delegateTask.getVariable("memberIdList")){
delegateTask.setVariable("memberIdList", idList);
//全员不通过，检测条件 directorCount
//TODO 1全员不通过,2会后需要多实例吗?
Integer allCount = delegateTask.getVariable("directorList",List.class).size();;
Integer count = 0;
if(null == delegateTask.getVariable("directorCount")){
delegateTask.setVariable("directorCount", count);
}
int rat = 0;
idList = delegateTask.getVariable("memberIdList",List.class);
if(!idList.isEmpty()){
for(String a : idList){
if(a.equals(object.getString("memberId"))){
rat = 1;
break;
}
}
}
idList.add(object.getString("memberId"));
delegateTask.setVariable("memberIdList",idList);
count = delegateTask.getVariable("directorCount",Integer.class);
delegateTask.setVariable("directorCount",count+1);
if(rat == 0){
if("1".equals(object.getString("passFlag"))) {
nextUserList.add(object.getString("memberId"));
if (null!=delegateTask.getVariable("memberList")) {
List<String> middle=delegateTask.getVariable("memberList",List.class);
middle.addAll(nextUserList);
delegateTask.setVariable("memberList",middle);
}else {
delegateTask.setVariable("memberList",nextUserList);
}
delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
}else{
//TODO 如果所有人未通过，则结束流程
if("1".equals(object.getString("passFlag"))) {
prcName = prcName + "参会代表填写参会信息表";
nextUserList.add(object.getString("memberId"));
if (null!=delegateTask.getVariable("memberList")) {
List<String> middle=delegateTask.getVariable("memberList",List.class);
middle.addAll(nextUserList);
delegateTask.setVariable("memberList",middle);
}else {
delegateTask.setVariable("memberList",nextUserList);
}
}else{
throw new ActivitiException("此对象已经审批过了");
delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
}
@@ -106,7 +89,6 @@ public class DirectorChooseAfter implements TaskListener {
delegateTask.setVariable("createUserName", username);
String standName = object.getString("listName");
delegateTask.setVariable("listName", standName);
String prcName ="标准化活动参会流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=21";
String link = "bzchStep?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java
+2 -3
View File
@@ -26,16 +26,16 @@ public class EngineerReviseAfter implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动参会流程-";
prcName = prcName + "技术管理中心主任审批";
nextUserList.add(object.getString("leader"));
delegateTask.setVariable("leader", object.getString("leader"));
@@ -46,7 +46,6 @@ public class EngineerReviseAfter implements TaskListener {
delegateTask.setVariable("createUserName", username);
String standName = object.getString("listName");
delegateTask.setVariable("listName", standName);
String prcName ="标准化活动参会流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=21";
String link = "bzchStep?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java
+3 -3
View File
@@ -38,7 +38,9 @@ public class EngineerReviseDoneAfter implements TaskListener {
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动参会流程-";
// prcName = "标准化活动参会流程-" + "会议结束";
prcName = prcName + "流程结束";
//TODO 流程结束，汇总
@@ -50,7 +52,6 @@ public class EngineerReviseDoneAfter implements TaskListener {
delegateTask.setVariable("createUserName", username);
String standName = object.getString("listName");
delegateTask.setVariable("listName", standName);
String prcName = "";
prcName = "标准化活动参会流程";
@@ -86,7 +87,6 @@ public class EngineerReviseDoneAfter implements TaskListener {
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
prcName = "标准化活动参会流程" + "会议结束";
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class EngineerReviseDoneBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=21";
String link = "bzchStep?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java
+3 -11
View File
@@ -29,19 +29,15 @@ public class LeaderVerifyAfter implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
//流程信息
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());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动参会流程-";
if("1".equals(object.getString("passFlag"))) {//通过
delegateTask.setVariable("pass3",1);
if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) {
@@ -54,15 +50,12 @@ public class LeaderVerifyAfter implements TaskListener {
// 配置多实例
delegateTask.setVariable("manageDepartmentList", nextUserList);
delegateTask.setVariable("manageDepartmentCount",nextUserList.size());
prcName = prcName + "费用管理部门会签";
}
}else{
delegateTask.setVariable("pass3",0);
nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
// if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
// nextUserList.add(object.getString("engineerSum"));
// delegateTask.setVariable("engineerSum", nextUserList);
// }
prcName = prcName + "标准法规工程师修订";
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
@@ -86,7 +79,6 @@ public class LeaderVerifyAfter implements TaskListener {
delegateTask.setVariable("createUserName", username);
String standName = object.getString("listName");
delegateTask.setVariable("listName", standName);
String prcName ="标准化活动参会流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class LeaderVerifyBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=21";
String link = "bzchStep?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java
+14 -36
View File
@@ -37,47 +37,26 @@ public class ManageSignAfter implements TaskListener {
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动参会流程-";
Integer count = 0;
if(null == delegateTask.getVariable("managePassCount")){
delegateTask.setVariable("managePassCount",count);
}
//防止重复审批同一对象
List<String> idList = new ArrayList<>();
if(null == delegateTask.getVariable("manageIdList")){
delegateTask.setVariable("manageIdList", idList);
}
int rat = 0;
idList = delegateTask.getVariable("manageIdList",List.class);
if(!idList.isEmpty()){
for(String a : idList){
if(a.equals(object.getString("manageDepartment"))){
rat = 1;
break;
}
}
}
idList.add(object.getString("manageDepartment"));
delegateTask.setVariable("manageIdList",idList);
if(rat == 0){
if("1".equals(object.getString("passFlag"))) {//通过
count = delegateTask.getVariable("managePassCount",Integer.class);
count++;
delegateTask.setVariable("managePassCount",count);
if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){
nextUserList.add(object.getString("president"));
delegateTask.setVariable("president", object.getString("president"));
delegateTask.setVariable("pass4",1);
}
}else{
delegateTask.setVariable("pass4",0);
nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
if("1".equals(object.getString("passFlag"))) {//通过
count = delegateTask.getVariable("managePassCount",Integer.class);
count++;
delegateTask.setVariable("managePassCount",count);
if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){
prcName = prcName + "技术委员会常务副主任/总院院长审定";
nextUserList.add(object.getString("president"));
delegateTask.setVariable("managePassCount",0);
delegateTask.setVariable("president", object.getString("president"));
delegateTask.setVariable("pass4",1);
}
}else{
throw new ActivitiException("此对象已经审批过了");
prcName = prcName + "标准法规工程师修订";
delegateTask.setVariable("pass4",0);
nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
@@ -101,7 +80,6 @@ public class ManageSignAfter implements TaskListener {
delegateTask.setVariable("createUserName", username);
String standName = object.getString("listName");
delegateTask.setVariable("listName", standName);
String prcName ="标准化活动参会流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class ManageSignBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=21";
String link = "bzchStep?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java
+3 -11
View File
@@ -28,30 +28,23 @@ public class PresidentVerifyAfter implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
//流程信息
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());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
// 入会申请信息重新封装
String prcName = "标准化活动参会流程-";
if("1".equals(object.getString("passFlag"))) {//通过
prcName = prcName + "标准法规工程师修订完毕";
delegateTask.setVariable("pass5",1);
nextUserList.add(object.getString("engineerSumDone"));
delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone"));
}else{
prcName = prcName + "标准法规工程师修订";
delegateTask.setVariable("pass5",0);
// if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
// nextUserList.add(object.getString("engineerSum"));
// delegateTask.setVariable("engineerSum", nextUserList);
// }
nextUserList.add(delegateTask.getVariable("engineerSum",String.class));
}
// 存储当前节点意见
@@ -75,7 +68,6 @@ public class PresidentVerifyAfter implements TaskListener {
delegateTask.setVariable("createUserName", username);
String standName = object.getString("listName");
delegateTask.setVariable("listName", standName);
String prcName ="标准化活动参会流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class PresidentVerifyBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=21";
String link = "bzchStep?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java
+3 -2
View File
@@ -41,7 +41,7 @@ public class WriteMaterialAfter implements TaskListener {
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动参会流程-";
// 入会申请信息重新封装
if(StringUtils.isNotBlank(object.getString("directorList"))) {
@@ -52,6 +52,7 @@ public class WriteMaterialAfter implements TaskListener {
}
// 配置多实例
delegateTask.setVariable("directorList", nextUserList);
prcName = prcName + "分委会主任/部门中心主任提名入会代表";
}
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
@@ -60,7 +61,7 @@ public class WriteMaterialAfter implements TaskListener {
delegateTask.setVariable("createUserName", username);
String standName = object.getString("listName");
delegateTask.setVariable("listName", standName);
String prcName ="标准化活动参会流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java
+1 -1
View File
@@ -15,7 +15,7 @@ public class WriteMaterialBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=21";
String link = "bzchStep?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java
+2 -9
View File
@@ -29,25 +29,19 @@ public class WriteMemberInfoAfter implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
//流程信息
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());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动参会流程-";
prcName = prcName + "参会人员所在部门中心主任审核";
nextUserList.add(object.getString("charge"));
delegateTask.setVariable("charge", object.getString("charge"));
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
delegateTask.setVariable("createUser", user);
@@ -55,7 +49,6 @@ public class WriteMemberInfoAfter implements TaskListener {
delegateTask.setVariable("createUserName", username);
String standName = object.getString("listName");
delegateTask.setVariable("listName", standName);
String prcName ="标准化活动参会流程";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=21";
String link = "bzchStep?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java
+27 -40
View File
@@ -32,65 +32,53 @@ public class ChargeVerifyAfter implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动入会流程-";
String prcName = "标准化活动入会流程-";
JSONObject sum = new JSONObject();
if(null == delegateTask.getVariable("membersSumJSON")){
delegateTask.setVariable("membersSumJSON",sum);
}
Integer count = 0;
if(null == delegateTask.getVariable("chargePassCount")){
delegateTask.setVariable("chargePassCount",count);
}
if("1".equals(object.getString("passFlag"))){//通过
JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole");
sum = delegateTask.getVariable("membersSumJSON",JSONObject.class);
if(sum.isEmpty()){
sum = object;
delegateTask.setVariable("membersSumJSON",sum);
}else {
JSONObject o1 = sum.getJSONObject("rh_pageData");
JSONObject o = os.getJSONObject(0);
JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole");
os1.add(o);
o1.put("myPartRole",os1);
sum.put("rh_pageData",o1);
delegateTask.setVariable("membersSumJSON",sum);
if("1".equals(object.getString("passFlag"))){//通过
JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole");
sum = delegateTask.getVariable("membersSumJSON",JSONObject.class);
if(sum.isEmpty()){
sum = object;
delegateTask.setVariable("membersSumJSON",sum);
}else {
JSONObject o1 = sum.getJSONObject("rh_pageData");
JSONObject o = os.getJSONObject(0);
JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole");
os1.add(o);
o1.put("myPartRole",os1);
sum.put("rh_pageData",o1);
delegateTask.setVariable("membersSumJSON",sum);
}
count = delegateTask.getVariable("chargePassCount",Integer.class);
delegateTask.setVariable("chargePassCount",count + 1);
delegateTask.setVariable("pass2",1);//排他通道
if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
prcName = prcName + "标准法规工程师汇总修订";
if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
nextUserList.add(object.getString("engineerSum"));
delegateTask.setVariable("engineerSum", object.getString("engineerSum"));
}
count = delegateTask.getVariable("chargePassCount",Integer.class);
delegateTask.setVariable("chargePassCount",count + 1);
delegateTask.setVariable("pass2",1);//排他通道
if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){
prcName = prcName + "标准法规工程师汇总修订";
if(StringUtils.isNotBlank(object.getString("engineerSum"))) {
nextUserList.add(object.getString("engineerSum"));
delegateTask.setVariable("engineerSum", object.getString("engineerSum"));
}
}
}else{
}
}else{
prcName = prcName + "入会代表填写入会信息表";
delegateTask.setVariable("pass2",0);//排他通道
nextUserList.add(object.getString("member"));
}
}
// 存储当前节点意见
if (null != object.getString("commentText")) {
@@ -107,7 +95,6 @@ public class ChargeVerifyAfter implements TaskListener {
}
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
delegateTask.setVariable("createUser", user);
src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java
+21 -19
View File
@@ -32,37 +32,39 @@ public class DirectorChooseAfter implements TaskListener {
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动入会流程-";
String prcName = "标准化活动入会流程-";
//如果 他是通过 passFlag==1
List<String> passMemberList = new ArrayList<>();
if(null == delegateTask.getVariable("memberList")){
delegateTask.setVariable("memberList", passMemberList);
}
//全员不通过，检测条件 directorCount
Integer allCount = delegateTask.getVariable("directorList",List.class).size();;
Integer count = 0;
if(null == delegateTask.getVariable("directorCount")){
delegateTask.setVariable("directorCount", count);
}
count = delegateTask.getVariable("directorCount",Integer.class);
delegateTask.setVariable("directorCount",count+1);
if("1".equals(object.getString("passFlag"))) {
prcName = prcName + "入会代表填写入会信息表";
nextUserList.add(object.getString("memberId"));
if (null!=delegateTask.getVariable("memberList")) {
List<String> middle=delegateTask.getVariable("memberList",List.class);
middle.addAll(nextUserList);
delegateTask.setVariable("memberList",middle);
}else {
delegateTask.setVariable("memberList",nextUserList);
}
delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
if("1".equals(object.getString("passFlag"))) {
prcName = prcName + "入会代表填写入会信息表";
nextUserList.add(object.getString("memberId"));
if (null!=delegateTask.getVariable("memberList")) {
List<String> middle=delegateTask.getVariable("memberList",List.class);
middle.addAll(nextUserList);
delegateTask.setVariable("memberList",middle);
}else {
delegateTask.setVariable("memberList",nextUserList);
}
if(delegateTask.getVariable("memberCount",Integer.class).equals(0)){
throw new ActivitiException("所有人不涉及入会，流程终止");
}
delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size());
}
// 存储当前节点意见
src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java
+1 -5
View File
@@ -28,18 +28,14 @@ public class EngineerReviseAfter implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
//流程信息
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());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动入会流程-";
prcName = prcName + "标准法规部主管领导审核";
nextUserList.add(object.getString("leader"));
src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动入会流程-";
// prcName = "标准化活动入会流程" + "会议结束";
// prcName = "标准化活动入会流程-" + "会议结束";
prcName = prcName + "流程结束";
//TODO 流程结束，入库
src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java
+1 -3
View File
@@ -29,7 +29,6 @@ public class LeaderVerifyAfter implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
//流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
//根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -37,9 +36,8 @@ public class LeaderVerifyAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动入会流程-";
if("1".equals(object.getString("passFlag"))) {//通过
delegateTask.setVariable("pass3",1);
if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) {
src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java
+1 -4
View File
@@ -36,16 +36,13 @@ public class ManageSignAfter implements TaskListener {
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动入会流程-";
Integer count = 0;
if(null == delegateTask.getVariable("managePassCount")){
delegateTask.setVariable("managePassCount",count);
}
if("1".equals(object.getString("passFlag"))) {//通过
count = delegateTask.getVariable("managePassCount",Integer.class);
count++;
src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java
+1 -3
View File
@@ -28,16 +28,14 @@ public class PresidentVerifyAfter implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
//流程信息
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());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动入会流程-";
if("1".equals(object.getString("passFlag"))) {//通过
prcName = prcName + "标准法规工程师汇总修订完毕";
src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java
-5
View File
@@ -29,17 +29,12 @@ public class WriteMemberInfoAfter implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
//流程信息
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());
Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson",object);
List<String> nextUserList = new ArrayList();
String prcName = "标准化活动入会流程-";