From 2902b27e56d1387c74b0612f21cc8a8a43bebad9 Mon Sep 17 00:00:00 2001 From: wangzhijiang <1358525938@qq.com> Date: Tue, 26 Mar 2024 10:55:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE=E8=AE=A2-?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86=E6=B5=81=E7=A8=8B-?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=E3=80=81=E6=B5=81=E7=A8=8B=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=94=B9=E9=80=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 9 +-- .../impl/IBusProcessHistoryServiceImpl.java | 10 ++-- .../bussLibrary/BLApplicantC1After.java | 57 ++++++++++--------- .../bussLibrary/BussLibrary4After.java | 2 +- 4 files changed, 42 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index 54947743..241ffeca 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -656,9 +656,9 @@ public class TodoTaskController extends BaseAction { }catch (Exception e){ logger.error(e.toString()); } - taskService.complete(busMes.getTaskId()); - this.busProcessHistoryService.complete(busMes); + + taskService.complete(busMes.getTaskId()); } else { return WrapMapper.error("当前任务不存在"); } @@ -690,12 +690,13 @@ public class TodoTaskController extends BaseAction { }catch (Exception e){ logger.error(e.toString()); } + busMes.setTaskId(taskId); + this.busProcessHistoryService.complete(busMes); + taskService.complete(taskId); } else { return WrapMapper.error("当前任务不存在"); } - busMes.setTaskId(taskId); - this.busProcessHistoryService.complete(busMes); } return WrapMapper.ok(prcid); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java index 0e48884a..b4e7f538 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/IBusProcessHistoryServiceImpl.java @@ -435,11 +435,11 @@ public class IBusProcessHistoryServiceImpl extends ServiceImpl bphQueryWrap = new QueryWrapper<>(); - bphQueryWrap.lambda().eq(BusProcessHistory::getActiProcInstId, delegateTask.getProcessInstanceId()); - bphQueryWrap.lambda().eq(BusProcessHistory::getUserId, qcUserId); - bphQueryWrap.lambda().eq(BusProcessHistory::getTaskKey, BussLibraryNodeKeyEnum.BUSS_LIBRARY2.getValue()); - bphQueryWrap.lambda().isNull(BusProcessHistory::getTaskId); - - List busProcessHistoryList = bphService.list(bphQueryWrap); - if (CollectionUtils.isEmpty(busProcessHistoryList)) { - List bphList = new ArrayList<>(); - // 重新起草 - BusProcessHistory cxqcBph = new BusProcessHistory(); - cxqcBph.setActiProcInstId(delegateTask.getProcessInstanceId()); - cxqcBph.setUserId(qcUserId); - cxqcBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY2.getValue()); - cxqcBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); - cxqcBph.setIsSub("2"); - cxqcBph.setIsMany("2"); + List bphList = new ArrayList<>(); + List qcUserIdList = Arrays.asList(json.getString("qcUserId").split(",")); + if (CollectionUtils.isNotEmpty(qcUserIdList)) { + // 企标编写节点父节点信息 + BusProcessHistory qbbxPBph = new BusProcessHistory(); + String qbbxPBphId = UUID.randomUUID().toString(); + qbbxPBph.setId(qbbxPBphId); + qbbxPBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + qbbxPBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY2.getValue()); + qbbxPBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); int orderNum = bphService.getMaxOrderNum(delegateTask.getProcessInstanceId(), BussLibraryNodeKeyEnum.BUSS_LIBRARY_C1.getValue()); - cxqcBph.setOrderNum(orderNum + 1); - bphList.add(cxqcBph); + qbbxPBph.setOrderNum(orderNum + 1); + qbbxPBph.setIsSub("2"); + qbbxPBph.setIsMany("1"); + bphList.add(qbbxPBph); - bphService.insertBatch(bphList); - bphService.updateOrderNum(delegateTask.getProcessInstanceId(), orderNum + 1, bphList.size()); + for (String qcUserId : qcUserIdList) { + // 企标编写子节点信息 + BusProcessHistory qbbxBph = new BusProcessHistory(); + qbbxBph.setActiProcInstId(delegateTask.getProcessInstanceId()); + qbbxBph.setUserId(qcUserId); + qbbxBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY2.getValue()); + qbbxBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); + qbbxBph.setOrderNum(orderNum + 1); + qbbxBph.setIsSub("2"); + qbbxBph.setIsMany("1"); + qbbxBph.setManyPId(qbbxPBphId); + bphList.add(qbbxBph); + } + + delegateTask.setVariable("qcUserList",qcUserIdList); } + bphService.insertBatch(bphList); } private String verifyObj(String str){ diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java index c28bb41b..1ad1d007 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java @@ -207,7 +207,7 @@ public class BussLibrary4After implements TaskListener{ zqyjPBph.setId(zqyjPBphId); zqyjPBph.setActiProcInstId(delegateTask.getProcessInstanceId()); zqyjPBph.setTaskKey(BussLibraryNodeKeyEnum.BUSS_LIBRARY5.getValue()); - zqyjPBph.setFlowType(FlowTypeEnum.BZZQYJLC.getValue()); + zqyjPBph.setFlowType(FlowTypeEnum.QBZXD_JSBZ.getValue()); zqyjPBph.setOrderNum(BussLibraryNodeKeyEnum.BUSS_LIBRARY5.getOrderNum()); zqyjPBph.setIsSub("2"); zqyjPBph.setIsMany("1");