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-10-26 15:07:28 +08:00
parent d432ad8b59
commit 133b885afa
8 changed files with 66 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class PRFApproveAfter implements TaskListener {
BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
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());
if (one2 != null) { if (one2 != null) {
//one2.setPrcName("入库流程结束"); one2.setPrcName("入库流程结束");
one2.setOverTime(OVERTIME); one2.setOverTime(OVERTIME);
one2.setPrcType("1"); one2.setPrcType("1");
busProcessNameService.saveOrUpdate(one2); busProcessNameService.saveOrUpdate(one2);
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java
+25 -56
View File
@@ -29,23 +29,24 @@ import com.alibaba.fastjson.JSONObject;
public class RAApproveAfter implements TaskListener { public class RAApproveAfter implements TaskListener {
@Override @Override
public void notify(DelegateTask delegateTask) { public void notify(DelegateTask delegateTask) {
//默认流程数据接口
IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
//流程节点信息
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>(); QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
Datas datas = datasService.getOne(queryWrapper); Datas datas = datasService.getOne(queryWrapper);
JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); JSONObject object = JSONObject.parseObject(datas.getFormValsJson());
delegateTask.setVariable("objectJson", object);
String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString();
if ("1".equalsIgnoreCase(approvalOpinion)) {
if("1".equalsIgnoreCase(approvalOpinion)){ delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser"));
delegateTask.setVariable("yzFlag",1);
delegateTask.setVariable("applyUserId",object.getString("applyUpdUserId"));
BusProcessNew busProcessNew = new BusProcessNew(); BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause"); busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId()); busProcessNew.setPId(delegateTask.getProcessInstanceId());
@@ -53,77 +54,45 @@ public class RAApproveAfter implements TaskListener {
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setFinishFlag("0"); busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNew.setTaskInfo(delegateTask.getName());
busProcessNew.setUserId(object.getString("applyUpdUserId")); busProcessNew.setUserId(object.getString("prcCreateUser"));
busProcessNew.setPrcName(delegateTask.getVariable("listName",String.class)+"-外部署名推荐批准-修改信息"); busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class));
busBean.save(busProcessNew); busBean.save(busProcessNew);
func1(delegateTask, busBean, object,"1"); func1(delegateTask, busBean, object, "1");
}else { delegateTask.setVariable("yzFlag", 2);
SarLawsDetailedList lawsDetailedList=lawsUserInfoService.getStandById(object.getString("standId")); } else {
if (null!=lawsDetailedList){ delegateTask.setVariable("yzFlag", 1);
DetailedUpDto detailed=new DetailedUpDto(); func2(delegateTask, busBean, object, "0", busProcessNameService);
detailed.setId(object.getString("standId"));
detailed.setApplicationScope(object.getString("applyRegion"));
detailed.setFileIds(object.getString("fileId"));
detailed.setRemark(object.getString("descriptionList"));
// detailed.setInforlist(object.getString("inforlist"));
JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList"));
String info="";
String putTime="";
String zccTime="";
String xcxTime="";
// for (Object o: jsonArray) {
// JSONObject object1=JSONObject.parseObject(o.toString());
// info=info+object1.getString("id")+",";
// putTime=putTime+object1.getString("issueTime")+",";
// zccTime=zccTime+object1.getString("ZCCSSRQ")+",";
// xcxTime=xcxTime+object1.getString("XCXSSRQ")+",";
// }
// detailed.setInforlist(info.substring(0,info.length()-1));
// detailed.setInforlist1(putTime.substring(0,putTime.length()-1));
// detailed.setInforlist2(zccTime.substring(0,zccTime.length()-1));
// detailed.setInforlist3(xcxTime.substring(0,xcxTime.length()-1));
// detailed.setDetailedListState("1");
// Date date=new Date();
// SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// detailed.setDetailedListVision(simpleDateFormat.format(date));
// lawsUserInfoService.updateLaws(detailed);
}else {
throw new ActivitiException("清单信息不存在，若多次出现此信息请联系管理员！！！");
}
delegateTask.setVariable("yzFlag",2);
func2(delegateTask, busBean, object,"0",busProcessNameService);
} }
} }
private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object,String commitFlag) {
private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) {
QueryWrapper queryWrapper1 = new QueryWrapper(); QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("TASK_ID",delegateTask.getId()); queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1); BusProcessNew one1 = busBean.getOne(queryWrapper1);
if(one1!=null){ if (one1 != null) {
one1.setCommitFlag(commitFlag); one1.setCommitFlag(commitFlag);
one1.setCommitText(object.getString("commentText")); one1.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one1); busBean.saveOrUpdate(one1);
} }
} }
private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object,String commitFlag ,IBusProcessNameService busProcessNameService) { private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) {
QueryWrapper queryWrapper2 = new QueryWrapper(); QueryWrapper queryWrapper2 = new QueryWrapper();
queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId());
BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); BusProcessName one2 = busProcessNameService.getOne(queryWrapper2);
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());
if(one2!=null){ if (one2 != null) {
one2.setPrcName("入库流程结束");
one2.setOverTime(OVERTIME); one2.setOverTime(OVERTIME);
one2.setPrcType("16"); one2.setPrcType("1");
busProcessNameService.saveOrUpdate(one2); busProcessNameService.saveOrUpdate(one2);
} }
QueryWrapper queryWrapper1 = new QueryWrapper(); QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("TASK_ID",delegateTask.getId()); queryWrapper1.eq("TASK_ID", delegateTask.getId());
BusProcessNew one1 = busBean.getOne(queryWrapper1); BusProcessNew one1 = busBean.getOne(queryWrapper1);
if(one1!=null){ if (one1 != null) {
one1.setCommitFlag(commitFlag); one1.setCommitFlag(commitFlag);
one1.setCommitText(object.getString("commentText")); one1.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one1); busBean.saveOrUpdate(one1);
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java
+11 -11
View File
@@ -44,28 +44,28 @@ public class RAAuditAfter implements TaskListener {
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
// 赋值 // 赋值
delegateTask.setVariable("director", object.getString("directUser")); delegateTask.setVariable("director", object.getString("directorUser"));
nextUserList.add(object.getString("directUser"));
delegateTask.setVariable("statuteengineer2", object.getString("directorUser"));
nextUserList.add(object.getString("directorUser")); nextUserList.add(object.getString("directorUser"));
delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser"));
nextUserList.add(object.getString("prcCreateUser"));
// 逻辑判断是否会签 signFlag // 逻辑判断 signFlag
if(object.getString("signFlag").equals("1")) { if(object.getString("signFlag").equals("1")) {
delegateTask.setVariable("bzFlag", 1); delegateTask.setVariable("bzFlag", 1);
if (StringUtils.isNotBlank(object.getString("directUser"))) { if (StringUtils.isNotBlank(object.getString("directorUser"))) {
if (object.getString("directUser").contains(",")) { if (object.getString("directorUser").contains(",")) {
nextUserList = Arrays.asList(object.getString("directUser").split(",")); nextUserList = Arrays.asList(object.getString("directorUser").split(","));
} else { } else {
nextUserList.add(object.getString("directUser")); nextUserList.add(object.getString("directorUser"));
} }
} }
} else { } else {
delegateTask.setVariable("bzFlag", 2); delegateTask.setVariable("bzFlag", 2);
if (StringUtils.isNotBlank(object.getString("directorUser"))) { if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) {
delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser"));
nextUserList.add(object.getString("directorUser")); nextUserList.add(object.getString("prcCreateUser"));
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java
+3 -3
View File
@@ -43,9 +43,9 @@ public class RAModifyInformationAfter implements TaskListener {
delegateTask.setVariable("objectJson", object); delegateTask.setVariable("objectJson", object);
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
// 赋值署名领导 // 赋值
delegateTask.setVariable("leadership", object.getString("creatUser")); delegateTask.setVariable("leadership", object.getString("dockUser"));
nextUserList.add(object.getString("creatUser")); nextUserList.add(object.getString("dockUser"));
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationBefore.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class RAModifyInformationBefore implements TaskListener{
CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
// 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
one1.setLink("bzqdfbStep6?prcType=16"); one1.setLink("bzqdfbStep1?prcType=16");
one1.setTaskInfo(delegateTask.getName()); one1.setTaskInfo(delegateTask.getName());
oaService.sendTodoMq(one1); oaService.sendTodoMq(one1);
} }
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java
+11 -13
View File
@@ -44,28 +44,26 @@ public class RASignAfter implements TaskListener {
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
// 赋值 // 赋值
delegateTask.setVariable("statuteminister", object.getString("dockUser")); delegateTask.setVariable("statuteminister", object.getString("ministerUser"));
nextUserList.add(object.getString("dockUser")); nextUserList.add(object.getString("ministerUser"));
delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser"));
nextUserList.add(object.getString("directorUser")); nextUserList.add(object.getString("prcCreateUser"));
// 逻辑判断是否会签 signFlag
if(object.getString("signFlag").equals("1")) { if(object.getString("signFlag").equals("1")) {
delegateTask.setVariable("ldFlag", 1); delegateTask.setVariable("ldFlag", 1);
if (StringUtils.isNotBlank(object.getString("dockUser"))) { if (StringUtils.isNotBlank(object.getString("ministerUser"))) {
if (object.getString("dockUser").contains(",")) { if (object.getString("ministerUser").contains(",")) {
nextUserList = Arrays.asList(object.getString("dockUser").split(",")); nextUserList = Arrays.asList(object.getString("ministerUser").split(","));
} else { } else {
nextUserList.add(object.getString("dockUser")); nextUserList.add(object.getString("ministerUser"));
} }
} }
} else { } else {
delegateTask.setVariable("ldFlag", 2); delegateTask.setVariable("ldFlag", 2);
if (StringUtils.isNotBlank(object.getString("directorUser"))) { if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) {
delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser"));
nextUserList.add(object.getString("directorUser")); nextUserList.add(object.getString("prcCreateUser"));
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java
+11 -11
View File
@@ -45,29 +45,29 @@ public class RAValidationAfter implements TaskListener {
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
// 赋值 // 赋值
delegateTask.setVariable("dean", object.getString("deanUser")); delegateTask.setVariable("dean", object.getString("president"));
nextUserList.add(object.getString("deanUser")); nextUserList.add(object.getString("president"));
delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser"));
nextUserList.add(object.getString("directorUser")); nextUserList.add(object.getString("prcCreateUser"));
// 逻辑判断是否审核 signFlag // 逻辑判断是否审核 signFlag
if(object.getString("signFlag").equals("1")) { if(object.getString("signFlag").equals("1")) {
delegateTask.setVariable("zrFlag", 1); delegateTask.setVariable("zrFlag", 1);
if (StringUtils.isNotBlank(object.getString("deanUser"))) { if (StringUtils.isNotBlank(object.getString("president"))) {
if (object.getString("deanUser").contains(",")) { if (object.getString("president").contains(",")) {
nextUserList = Arrays.asList(object.getString("deanUser").split(",")); nextUserList = Arrays.asList(object.getString("president").split(","));
} else { } else {
nextUserList.add(object.getString("deanUser")); nextUserList.add(object.getString("president"));
} }
} }
} else { } else {
delegateTask.setVariable("zrFlag", 2); delegateTask.setVariable("zrFlag", 2);
if (StringUtils.isNotBlank(object.getString("directorUser"))) { if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) {
delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser"));
nextUserList.add(object.getString("directorUser")); nextUserList.add(object.getString("prcCreateUser"));
} }
} }
src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java
+3 -3
View File
@@ -46,9 +46,9 @@ public class RAstartAfter implements TaskListener {
// 配置多实例 // 配置多实例
delegateTask.setVariable("leadershiplist",nextUserList); delegateTask.setVariable("leadershiplist",nextUserList);
// 赋值署名领导 // 赋值
delegateTask.setVariable("leadership", object.getString("creatUser")); delegateTask.setVariable("leadership", object.getString("dockUser"));
nextUserList.add(object.getString("creatUser")); nextUserList.add(object.getString("dockUser"));
//截止时间 流程描述 创建人 //截止时间 流程描述 创建人