diff --git a/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/enums/BpmTaskStatusEnum.java b/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/enums/BpmTaskStatusEnum.java index 7affa1de5..5b4a8e77c 100644 --- a/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/enums/BpmTaskStatusEnum.java +++ b/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/enums/BpmTaskStatusEnum.java @@ -31,7 +31,7 @@ public enum BpmTaskStatusEnum { * 1. 任务被向前【加签】时,它会变成 WAIT 状态,需要等待【加签】出来的任务被审批后,它才能继续变为 RUNNING 继续审批 * 2. 任务被向后【加签】时,【加签】出来的任务处于 WAIT 状态,它们需要等待该任务被审批后,它们才能继续变为 RUNNING 继续审批 */ - WAIT(0, "待审批"); + WAIT(0, "待提交审批"); /** * 状态 diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/FlowStatusEnum.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/FlowStatusEnum.java index b1b86dbb3..42264d75f 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/FlowStatusEnum.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/FlowStatusEnum.java @@ -10,7 +10,7 @@ import java.util.Objects; @Getter public enum FlowStatusEnum { - NEW(0, "新建"), + NEW(0, "待提交审批"), AUDIT(1, "审批中"), APPROVE(2, "审批通过"), OPPOSE(3, "审批不通过"), diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java index 86f51d46a..284f2e3c5 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java @@ -23,7 +23,10 @@ import java.util.Map; @NoArgsConstructor public class SupervisionDevMainReportParam { + private String id; + @ApiModelProperty(value = "保存1,提交审批2") + private String saveOrCheckflag; /** * 填报人 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java index da68e0a1d..2f55dc50f 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java @@ -1,7 +1,6 @@ package com.njcn.supervision.pojo.param.user; import com.fasterxml.jackson.annotation.JsonFormat; -import com.njcn.db.bo.BaseEntity; import com.njcn.supervision.pojo.po.user.UserReportProjectPO; import com.njcn.supervision.pojo.po.user.UserReportSensitivePO; import com.njcn.supervision.pojo.po.user.UserReportSubstationPO; @@ -29,6 +28,7 @@ import java.util.Map; @NoArgsConstructor public class UserReportParam { + private String id; /** * 填报人 @@ -112,6 +112,8 @@ public class UserReportParam { @ApiModelProperty("发起人自选审批人 Map") private Map> startUserSelectAssignees; + @ApiModelProperty(value = "保存1,提交审批2") + private String saveOrCheckflag; private UserReportProjectPO userReportProjectPO; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java index 9f7acbe92..655e5f06a 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java @@ -27,7 +27,6 @@ import com.njcn.supervision.pojo.param.device.SupervisionTempLineDebugParam; import com.njcn.supervision.pojo.po.device.SupervisionTempDeviceReport; import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO; import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport; -import com.njcn.supervision.pojo.vo.device.CheckDeviceVo; import com.njcn.supervision.pojo.vo.device.SupervisionDevMainReportVO; import com.njcn.supervision.pojo.vo.device.SupervisionTempLineDebugVO; import com.njcn.supervision.service.device.SupervisionDevMainReportPOService; @@ -95,7 +94,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); @@ -153,7 +152,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImplx diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java index 7d1ef419c..45acf3361 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java @@ -19,8 +19,10 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.supervision.enums.FlowStatusEnum; import com.njcn.supervision.enums.SupervisionKeyEnum; import com.njcn.supervision.enums.SupervisionUserStatusEnum; +import com.njcn.supervision.mapper.device.SupervisionTempLineDebugPOMapper; import com.njcn.supervision.mapper.device.SupervisionTempLineReportMapper; import com.njcn.supervision.pojo.param.device.SupervisionTempLineReportParam; +import com.njcn.supervision.pojo.po.device.SupervisionTempLineDebugPO; import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport; import com.njcn.supervision.pojo.vo.device.CheckDeviceVo; import com.njcn.supervision.pojo.vo.device.SupervisionTempLineReportVO; @@ -62,6 +64,8 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); - BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); - bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.BUILD_USER_INFO.getKey()); - bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportPO.getId()); - bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(userReportParam.getStartUserSelectAssignees()); - bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); - String processInstanceId = bpmProcessFeignClient.createProcessInstance(userReportPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); - // 将工作流的编号,更新到流程单中 - userReportPO.setProcessInstanceId(processInstanceId); - this.baseMapper.updateById(userReportPO); + + // 如何未提交审则不需要发起 BPM 流程 + if(Objects.equals(userReportParam.getSaveOrCheckflag(),"2")){ + Map processInstanceVariables = new HashMap<>(); + BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(SupervisionKeyEnum.BUILD_USER_INFO.getKey()); + bpmProcessInstanceCreateReqDTO.setBusinessKey(userReportPO.getId()); + bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(userReportParam.getStartUserSelectAssignees()); + bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); + String processInstanceId = bpmProcessFeignClient.createProcessInstance(userReportPO.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); + // 将工作流的编号,更新到流程单中 + userReportPO.setProcessInstanceId(processInstanceId); + this.baseMapper.updateById(userReportPO); + } + return userReportPO.getId(); } @@ -646,28 +661,31 @@ public class UserReportPOServiceImpl extends ServiceImpl userReportPOLambdaQueryWrapper = new LambdaQueryWrapper<>(); - userReportPOLambdaQueryWrapper - .eq(UserReportPO::getProjectName, userReportParam.getProjectName()) - .in(UserReportPO::getStatus, CollectionUtil.newArrayList(BpmProcessInstanceStatusEnum.RUNNING.getStatus(), BpmProcessInstanceStatusEnum.APPROVE.getStatus())) - .eq(UserReportPO::getState, DataStateEnum.ENABLE.getCode()); - //更新的时候,需排除当前记录 - if (isExcludeSelf) { - if (userReportParam instanceof UserReportParam.UserReportUpdate) { - userReportPOLambdaQueryWrapper.ne(UserReportPO::getId, ((UserReportParam.UserReportUpdate) userReportParam).getId()); + if(!StringUtils.isEmpty(userReportParam.getProjectName())){ + LambdaQueryWrapper userReportPOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + userReportPOLambdaQueryWrapper + .eq(UserReportPO::getProjectName, userReportParam.getProjectName()) + .in(UserReportPO::getStatus, CollectionUtil.newArrayList(BpmProcessInstanceStatusEnum.RUNNING.getStatus(), BpmProcessInstanceStatusEnum.APPROVE.getStatus())) + .eq(UserReportPO::getState, DataStateEnum.ENABLE.getCode()); + //更新的时候,需排除当前记录 + if (isExcludeSelf) { + if (userReportParam instanceof UserReportParam.UserReportUpdate) { + userReportPOLambdaQueryWrapper.ne(UserReportPO::getId, ((UserReportParam.UserReportUpdate) userReportParam).getId()); + } } - } - List userReportPOList = this.baseMapper.selectList(userReportPOLambdaQueryWrapper); - if (CollectionUtil.isNotEmpty(userReportPOList)) { - //过滤已取消的申请 - userReportPOList = userReportPOList.stream() - .filter(userReportPO -> !userReportPO.getStatus().equals(FlowStatusEnum.CANCEL.getCode())) - .collect(Collectors.toList()); - //如果还存在,则说明有人申请过了 + List userReportPOList = this.baseMapper.selectList(userReportPOLambdaQueryWrapper); if (CollectionUtil.isNotEmpty(userReportPOList)) { - throw new BusinessException(userReportParam.getProjectName().concat(",该工程已被").concat(userReportPOList.get(0).getReporter()).concat("申请")); + //过滤已取消的申请 + userReportPOList = userReportPOList.stream() + .filter(userReportPO -> !userReportPO.getStatus().equals(FlowStatusEnum.CANCEL.getCode())) + .collect(Collectors.toList()); + //如果还存在,则说明有人申请过了 + if (CollectionUtil.isNotEmpty(userReportPOList)) { + throw new BusinessException(userReportParam.getProjectName().concat(",该工程已被").concat(userReportPOList.get(0).getReporter()).concat("申请")); + } } } + }