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

。

Browse Source
This commit is contained in:
liao
2021-11-03 14:39:56 +08:00
parent f7325642d0
commit a6df825a75
8 changed files with 91 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java
+39 -12
View File
@@ -13,7 +13,9 @@ import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class PRFApproveAfter implements TaskListener {
@Override
@@ -31,7 +33,7 @@ public class PRFApproveAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList();
String approvalOpinion = object.get("bzFlag") == null ? "" : object.get("bzFlag").toString();
if ("1".equalsIgnoreCase(approvalOpinion)) {
@@ -39,19 +41,44 @@ public class PRFApproveAfter implements TaskListener {
func1(delegateTask, busBean, object, "1", busProcessNameService);
} else {
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("sonUser"));
busProcessNew.setPrcName("参与外部标准制修订备案-修改入会信息");
busBean.save(busProcessNew);
func2(delegateTask, busBean, object, "0");
delegateTask.setVariable("bzFlag", 2);
delegateTask.setVariable("Liabilityengineer",delegateTask.getVariable("Liabilityengineer1",String.class));
nextUserList.add(delegateTask.getVariable("Liabilityengineer1",String.class));
}
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
String prcName="";
if(object.get("bzFlag").equals("2")) {
prcName = "参与外部标准制修订备案-修改备案信息";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if(one1!=null){
one1.setPrcType("14");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
}
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java
+2 -4
View File
@@ -51,13 +51,11 @@ public class PRFEngineerreviewAfter implements TaskListener {
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
if(object.getString("signFlag").equals("1")) {
prcName = standName + "-参与外部标准制修订备案-部长批准";
prcName = "参与外部标准制修订备案-部长批准";
}else {
prcName = standName + "-参与外部标准制修订备案-修改备案信息";
prcName = "参与外部标准制修订备案-修改备案信息";
}
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java
+38 -27
View File
@@ -34,42 +34,53 @@ public class PRFFillinformationAfter implements TaskListener {
JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
String approvalOpinion = object.get("dlFlag") == null ? "" : object.get("dlFlag").toString();
if ("1".equalsIgnoreCase(approvalOpinion)) {
BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("passUser"));
busProcessNew.setPrcName("参与外部标准制修订备案-责任部门对接人审核");
busBean.save(busProcessNew);
func1(delegateTask, busBean, object, "1");
List<String> nextUserList = new ArrayList();
if (object.getString("signFlag").equals("1")) {
delegateTask.setVariable("dlFlag", 1);
delegateTask.setVariable("Buttpeople2",delegateTask.getVariable("Buttpeople3",String.class));
delegateTask.setVariable("Buttpeople2", delegateTask.getVariable("Buttpeople3", String.class));
nextUserList.add(delegateTask.getVariable("Buttpeople3", String.class));
} else {
delegateTask.setVariable("dlFlag", 2);
func2(delegateTask, busBean, object, "0", busProcessNameService);
}
}
private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) {
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1);
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
String prcName = "";
if (object.getString("signFlag").equals("1")) {
prcName = "参与外部标准制修订备案-责任部门对接人审核";
}
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
if (one1 != null) {
one1.setCommitFlag(commitFlag);
one1.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one1);
one1.setPrcType("14");
one1.setPrcName(prcName);
one1.setCreatUser(user);
one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1);
}
if (nextUserList != null && !nextUserList.isEmpty()) {
for (String nextUser : nextUserList) {
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0");
busProcessNewNext.setTaskInfo(delegateTask.getName());
busProcessNewNext.setUserId(nextUser);
busProcessNewNext.setPrcName(prcName);
busBean.save(busProcessNewNext);
}
}
}
private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) {
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java
+2 -4
View File
@@ -51,13 +51,11 @@ public class PRFReviewdockAfter implements TaskListener {
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
String standName = object.getString("listName");
delegateTask.setVariable("listName",standName);
String prcName="";
if(object.getString("signFlag").equals("1")) {
prcName = standName + "-参与外部标准制修订备案-工程师审核";
prcName = "参与外部标准制修订备案-工程师审核";
}else {
prcName = standName + "-参与外部标准制修订备案-修改备案信息";
prcName = "参与外部标准制修订备案-修改备案信息";
}
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java
+3 -3
View File
@@ -34,7 +34,7 @@ public class PRFUnderengineerAfter implements TaskListener {
delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList();
String ids=object.getString("sonUser");
String ids=object.getString("workPeople");
if(ids.contains(",")){
nextUserList=new ArrayList<>(Arrays.asList(ids.split(",")));
}else {
@@ -43,14 +43,14 @@ public class PRFUnderengineerAfter implements TaskListener {
// 配置多实例
delegateTask.setVariable("Liabilityengineerlist",nextUserList);
delegateTask.setVariable("Liabilityengineer1", object.getString("workPeople"));
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
String username = object.getString("prcCreateUserName");
delegateTask.setVariable("prcCreateUser", user);
delegateTask.setVariable("prcCreateUserName", username);
String prcName = delegateTask.getVariable("listName", String.class) + "-参与外部标准制修订备案-填写备案信息";
String prcName = "参与外部标准制修订备案-填写备案信息";
QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java
+5 -6
View File
@@ -34,7 +34,7 @@ public class PRFstartAfter implements TaskListener {
delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList();
String ids=object.getString("creatUser");
String ids=object.getString("dockUser");
if(ids.contains(",")){
nextUserList=new ArrayList<>(Arrays.asList(ids.split(",")));
}else {
@@ -42,12 +42,11 @@ public class PRFstartAfter implements TaskListener {
}
// 配置多实例
delegateTask.setVariable("Buttpeoplelist",nextUserList);
delegateTask.setVariable("Buttpeople1list",nextUserList);
delegateTask.setVariable("Buttpeople3", object.getString("passUser"));
delegateTask.setVariable("Liabilityengineer1", object.getString("sonUser"));
delegateTask.setVariable("statuteengineer1", object.getString("statuteengineerUser"));
delegateTask.setVariable("statuteminister1", object.getString("statuteministerUser"));
delegateTask.setVariable("Buttpeople3", object.getString("dockUser"));
delegateTask.setVariable("statuteengineer1", object.getString("firstUser"));
delegateTask.setVariable("statuteminister1", object.getString("directorUser"));
//截止时间 流程描述 创建人
String user = object.getString("prcCreateUser");
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartBefore.java
+1 -9
View File
@@ -6,15 +6,7 @@ import org.activiti.engine.delegate.TaskListener;
public class PRFstartBefore implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
// IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
// QueryWrapper queryWrapper1 = new QueryWrapper();
// queryWrapper1.isNull("TASK_ID");
// List<BusProcessNew> list = busBean.list(queryWrapper1);
// if(!list.isEmpty()){
// BusProcessNew one1 = list.get(0);
// one1.setTaskId(delegateTask.getId());
// busBean.saveOrUpdate(one1);
// }
}
}
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java
+1
View File
@@ -12,6 +12,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil;
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 RAstartAfter implements TaskListener {