diff --git a/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/dto/BpmInstanceInfo.java b/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/dto/BpmInstanceInfo.java new file mode 100644 index 000000000..940c19e64 --- /dev/null +++ b/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/dto/BpmInstanceInfo.java @@ -0,0 +1,23 @@ +package com.njcn.bpm.pojo.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * + */ +@Data +public class BpmInstanceInfo implements Serializable { + + /** + * 历史流程实例编号 + */ + private String historyInstanceId; + + /** + * 业务流程重要信息 + */ + private String instanceSign; + +} diff --git a/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/service/IBpmService.java b/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/service/IBpmService.java index 411667c77..c6d1d6e57 100644 --- a/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/service/IBpmService.java +++ b/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/service/IBpmService.java @@ -1,6 +1,7 @@ package com.njcn.bpm.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.bpm.pojo.dto.BpmInstanceInfo; /** @@ -18,4 +19,10 @@ public interface IBpmService extends IService { */ void updateProcessStatus(String businessId, Integer status); +// /** +// * 根据业务id获取历史审批id以及该任务的重要信息 +// * @param processKey 业务流程key +// * @param businessId 业务流程id +// */ +// BpmInstanceInfo getInstanceInfo(String processKey,String businessId); } 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 3f2562208..b1b86dbb3 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,6 +10,7 @@ import java.util.Objects; @Getter public enum FlowStatusEnum { + NEW(0, "新建"), AUDIT(1, "审批中"), APPROVE(2, "审批通过"), OPPOSE(3, "审批不通过"), diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java index 55fae4724..fca756146 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionKeyEnum.java @@ -1,6 +1,5 @@ package com.njcn.supervision.enums; -import cn.hutool.core.text.StrPool; import lombok.Getter; @Getter @@ -48,9 +47,9 @@ public enum SupervisionKeyEnum { * 根据流程key获取类的全路径，用于获取spring中的对象 */ public static String getFullServicePathByKey(String key){ - for (SupervisionKeyEnum superviceKeyEnum : SupervisionKeyEnum.values()) { - if (superviceKeyEnum.key.equalsIgnoreCase(key)) { - return packagePrefix.concat(superviceKeyEnum.servicePrefix).concat(packageMiddle).concat(superviceKeyEnum.clazzName); + for (SupervisionKeyEnum supervisionKeyEnum : SupervisionKeyEnum.values()) { + if (supervisionKeyEnum.key.equalsIgnoreCase(key)) { + return packagePrefix.concat(supervisionKeyEnum.servicePrefix).concat(packageMiddle).concat(supervisionKeyEnum.clazzName); } } return null; @@ -61,8 +60,8 @@ public enum SupervisionKeyEnum { * 判断流程key是否在当前枚举内 */ public static boolean containBusinessKye(String key){ - for (SupervisionKeyEnum superviceKeyEnum : SupervisionKeyEnum.values()) { - if (superviceKeyEnum.key.equalsIgnoreCase(key)) { + for (SupervisionKeyEnum supervisionKeyEnum : SupervisionKeyEnum.values()) { + if (supervisionKeyEnum.key.equalsIgnoreCase(key)) { return true; } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java index b448ea3eb..1a9541b14 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/TempLineController.java @@ -21,6 +21,7 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; /** * 干扰源用户管理 @@ -81,6 +82,8 @@ public class TempLineController extends BaseController { SupervisionTempLineReportVO out = supervisionTempLineReportService.getDetailTempLine(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe); } + + @ApiIgnore @GetMapping("/updateStatus") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("更改表单状态") 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 8e22b034d..5982c3724 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 @@ -141,23 +141,17 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl getTempLineDeug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); - List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); - - queryWrapper.in("supervision_temp_line_report.create_by", colleaguesIds) .eq("supervision_temp_line_report.state", DataStateEnum.ENABLE.getCode()); if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgNo())) { /*获取直接下属子单位*/ List data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgNo()).getData(); queryWrapper.in("supervision_temp_line_report.org_id", data); - } - if (Objects.nonNull(supervisionTempLineDebugQuery.getStatus())) { queryWrapper.eq("supervision_temp_line_report.status", supervisionTempLineDebugQuery.getStatus()); } - if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getSearchValue())) { queryWrapper.and(x->x .like("supervision_temp_line_report.Power_Substation_Name", supervisionTempLineDebugQuery.getSearchValue()) @@ -169,24 +163,19 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl page =this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper); - return page; } @Override public Page pageHasDebug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); - List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); - queryWrapper.in("supervision_temp_line_debug.Create_By", colleaguesIds) .eq("supervision_temp_line_debug.state", DataStateEnum.ENABLE.getCode()); if (StrUtil.isNotBlank(supervisionTempLineDebugQuery.getOrgNo())) { @@ -194,7 +183,6 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineDebugQuery.getOrgNo()).getData(); queryWrapper.in("supervision_temp_line_report.org_id", data); } - if (Objects.nonNull(supervisionTempLineDebugQuery.getStatus())) { queryWrapper.eq("supervision_temp_line_debug.status", supervisionTempLineDebugQuery.getStatus()); } 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 e515a0357..206dc3198 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 @@ -120,10 +120,8 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl getTempLineReport(SupervisionTempLineReportParam.SupervisionTempLineReportQuery supervisionTempLineReportQuery) { QueryWrapper queryWrapper = new QueryWrapper<>(); - //获取当前用户部门所有同事的id，查看该部门下所有的数据 List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); - queryWrapper.in("supervision_temp_line_report.create_by", colleaguesIds) .eq("supervision_temp_line_report.state", DataStateEnum.ENABLE.getCode()) .in(CollectionUtil.isNotEmpty(supervisionTempLineReportQuery.getStatueList()),"supervision_temp_line_report.status",supervisionTempLineReportQuery.getStatueList()); @@ -132,7 +130,6 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl data = deptFeignClient.getDepSonIdtByDeptId(supervisionTempLineReportQuery.getOrgNo()).getData(); queryWrapper.in("supervision_temp_line_report.org_id", data); } - if (Objects.nonNull(supervisionTempLineReportQuery.getStatus())) { queryWrapper.eq("supervision_temp_line_report.status", supervisionTempLineReportQuery.getStatus()); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index cfcfa2c20..5db8bd49e 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -245,15 +245,12 @@ public class UserReportPOServiceImpl extends ServiceImpl getUserReport(UserReportParam.UserReportQueryParam userReportQueryParam) { QueryWrapper userReportVOQueryWrapper = new QueryWrapper<>(); - List colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); - userReportVOQueryWrapper.in("supervision_user_report.create_by", colleaguesIds) .eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode()) .eq("supervision_user_report.data_type",0);