Merge remote-tracking branch 'origin/Three' into Three

This commit is contained in:
koweiyi
2021-10-27 09:11:28 +08:00
46 changed files with 59 additions and 57 deletions
@@ -13,6 +13,7 @@ import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class JSFstartAfter implements TaskListener {
@@ -33,22 +34,23 @@ public class JSFstartAfter implements TaskListener {
delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList();
String ids=object.getString("dockUser");
if(ids.contains(",")){
nextUserList=new ArrayList<>(Arrays.asList(ids.split(",")));
}else {
nextUserList.add(ids);
}
// 配置多实例
delegateTask.setVariable("Standardizer1list",nextUserList);
// 赋值
delegateTask.setVariable("Standardizer1", object.getString("creatUser"));
nextUserList.add(object.getString("creatUser"));
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
// delegateTask.setVariable("stId",object.getString("projectNumber"));
String prcName = "加入标准化协会信息备案-备案任务发起";
String prcName = delegateTask.getVariable("listName", String.class) + "-加入标准化协会信息备案-备案任务发起";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
@@ -36,13 +36,11 @@ public class PRFReviewdockAfter implements TaskListener {
List<String> nextUserList = new ArrayList();
// 赋值
delegateTask.setVariable("statuteengineer", object.getString("statuteengineerUser"));
delegateTask.setVariable("statuteengineer", object.getString("statuteengi6neerUser"));
nextUserList.add(object.getString("statuteengineerUser"));
delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser"));
nextUserList.add(object.getString("LiabilityengineerUser"));
// 逻辑判断是否会签 signFlag
if(object.getString("signFlag").equals("1")) {
delegateTask.setVariable("djrFlag", 1);
if (StringUtils.isNotBlank(object.getString("statuteengineerUser"))) {
@@ -13,6 +13,7 @@ import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class PRFstartAfter implements TaskListener {
@@ -33,14 +34,15 @@ public class PRFstartAfter implements TaskListener {
delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList();
String ids=object.getString("creatUser");
if(ids.contains(",")){
nextUserList=new ArrayList<>(Arrays.asList(ids.split(",")));
}else {
nextUserList.add(ids);
}
// 配置多实例
delegateTask.setVariable("Buttpeoplelist",nextUserList);
// 赋值
delegateTask.setVariable("Buttpeople", object.getString("creatUser"));
nextUserList.add(object.getString("creatUser"));
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
@@ -63,7 +63,7 @@ public class AutoStartAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("13");
one1.setPrcType("22");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class AutoStartBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=13";
String link = "bzqdfbStep2?prcType=22";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
@@ -85,7 +85,7 @@ public class DirectorVerifyAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("13");
one1.setPrcType("22");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class DirectorVerifyBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=13";
String link = "bzqdfbStep2?prcType=22";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
@@ -64,7 +64,7 @@ public class MemberUploadInfoAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("13");
one1.setPrcType("22");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class MemberUploadInfoBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=13";
String link = "bzqdfbStep2?prcType=22";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
@@ -129,7 +129,7 @@ prcName = standName + "-标准化活动参会流程-";
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("12");
one1.setPrcType("21");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=12";
String link = "bzqdfbStep2?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
@@ -114,7 +114,7 @@ public class DirectorChooseAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("12");
one1.setPrcType("21");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=12";
String link = "bzqdfbStep2?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
@@ -61,7 +61,7 @@ public class EngineerReviseAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("12");
one1.setPrcType("21");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=12";
String link = "bzqdfbStep2?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
@@ -65,7 +65,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("12");
one1.setPrcType("21");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class EngineerReviseDoneBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=12";
String link = "bzqdfbStep2?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
@@ -95,7 +95,7 @@ public class LeaderVerifyAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("12");
one1.setPrcType("21");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class LeaderVerifyBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=12";
String link = "bzqdfbStep2?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
@@ -117,7 +117,7 @@ public class ManageSignAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("12");
one1.setPrcType("21");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class ManageSignBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=12";
String link = "bzqdfbStep2?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
@@ -85,7 +85,7 @@ public class PresidentVerifyAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("12");
one1.setPrcType("21");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class PresidentVerifyBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=12";
String link = "bzqdfbStep2?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
@@ -68,7 +68,7 @@ public class WriteMaterialAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("12");
one1.setPrcType("21");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -15,7 +15,7 @@ public class WriteMaterialBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=12";
String link = "bzqdfbStep2?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
@@ -66,7 +66,7 @@ public class WriteMemberInfoAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("12");
one1.setPrcType("21");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=12";
String link = "bzqdfbStep2?prcType=21";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
@@ -129,7 +129,7 @@ prcName = standName + "-标准化活动入会流程-";
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("11");
one1.setPrcType("20");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=11";
String link = "bzqdfbStep2?prcType=20";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
@@ -112,7 +112,7 @@ public class DirectorChooseAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("11");
one1.setPrcType("20");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=11";
String link = "bzqdfbStep2?prcType=20";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
@@ -61,7 +61,7 @@ public class EngineerReviseAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("11");
one1.setPrcType("20");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=11";
String link = "bzqdfbStep2?prcType=20";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
@@ -64,7 +64,7 @@ public class EngineerReviseDoneAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("11");
one1.setPrcType("20");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class EngineerReviseDoneBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=11";
String link = "bzqdfbStep2?prcType=20";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
@@ -93,7 +93,7 @@ public class LeaderVerifyAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("11");
one1.setPrcType("20");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class LeaderVerifyBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=11";
String link = "bzqdfbStep2?prcType=20";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
@@ -119,7 +119,7 @@ public class ManageSignAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("11");
one1.setPrcType("20");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class ManageSignBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=11";
String link = "bzqdfbStep2?prcType=20";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
@@ -85,7 +85,7 @@ public class PresidentVerifyAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("11");
one1.setPrcType("20");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class PresidentVerifyBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=11";
String link = "bzqdfbStep2?prcType=20";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
@@ -68,7 +68,7 @@ public class WriteMaterialAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("11");
one1.setPrcType("20");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -15,7 +15,7 @@ public class WriteMaterialBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=11";
String link = "bzqdfbStep2?prcType=20";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
@@ -66,7 +66,7 @@ public class WriteMemberInfoAfter implements TaskListener {
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setPrcType("11");
one1.setPrcType("20");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
@@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
String link = "bzqdfbStep2?prcType=11";
String link = "bzqdfbStep2?prcType=20";
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
QueryWrapper queryWrapper1 = new QueryWrapper();
@@ -24,7 +24,7 @@ import java.util.List;
/**
* 标准入库申请人发起后
*/
public class SLApplicantAfter implements TaskListener{
public class prcName = standName + "-标准化活动参会流程-"; implements TaskListener{
@Override
public void notify(DelegateTask delegateTask) {