微调

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;
+
+}

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<T> extends IService<T> {
      */
     void updateProcessStatus(String businessId, Integer status);
 
+//    /**
+//     * 根据业务id获取历史审批id以及该任务的重要信息
+//     * @param processKey 业务流程key
+//     * @param businessId 业务流程id
+//     */
+//    BpmInstanceInfo  getInstanceInfo(String processKey,String businessId);
 }

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, "审批不通过"),

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()) {
+        for (SupervisionKeyEnum supervisionKeyEnum : SupervisionKeyEnum.values()) {
-            if (superviceKeyEnum.key.equalsIgnoreCase(key)) {
+            if (supervisionKeyEnum.key.equalsIgnoreCase(key)) {
-                return packagePrefix.concat(superviceKeyEnum.servicePrefix).concat(packageMiddle).concat(superviceKeyEnum.clazzName);
+                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()) {
+        for (SupervisionKeyEnum supervisionKeyEnum : SupervisionKeyEnum.values()) {
-            if (superviceKeyEnum.key.equalsIgnoreCase(key)) {
+            if (supervisionKeyEnum.key.equalsIgnoreCase(key)) {
                 return true;
             }
         }

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("更改表单状态")

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java

@@ -141,23 +141,17 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
     @Override
     public Page<SupervisionTempLineDebugVO> getTempLineDeug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery) {
         QueryWrapper<SupervisionDevMainReportVO> queryWrapper = new QueryWrapper<>();
-
         List<String> 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<String> 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<Supervisi
                     .like("supervision_temp_line_report.line_name", supervisionTempLineDebugQuery.getSearchValue())
             );
         }
-
         //添加上时间范围
         queryWrapper.between("supervision_temp_line_report.Create_Time",
                 DateUtil.beginOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchBeginTime())),
                 DateUtil.endOfDay(DateUtil.parse(supervisionTempLineDebugQuery.getSearchEndTime())));
         queryWrapper.orderByDesc("supervision_temp_line_report.Update_Time");
-
         Page<SupervisionTempLineDebugVO> page =this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionTempLineDebugQuery), PageFactory.getPageSize(supervisionTempLineDebugQuery)), queryWrapper);
-
         return page;
     }
 
     @Override
     public Page<SupervisionTempLineDebugVO> pageHasDebug(SupervisionTempLineDebugParam.SupervisionTempLineDebugQuery supervisionTempLineDebugQuery) {
         QueryWrapper<SupervisionDevMainReportVO> queryWrapper = new QueryWrapper<>();
-
         List<String> 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<Supervisi
             List<String> 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());
         }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java

@@ -120,10 +120,8 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
     @Override
     public Page<SupervisionTempLineReportVO> getTempLineReport(SupervisionTempLineReportParam.SupervisionTempLineReportQuery supervisionTempLineReportQuery) {
         QueryWrapper<SupervisionTempLineReport> queryWrapper = new QueryWrapper<>();
-
         //获取当前用户部门所有同事的id，查看该部门下所有的数据
         List<String> 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<Supervisio
             List<String> 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());
         }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java

@@ -245,15 +245,12 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
     }
 
     /**
-     * 正常用户只能看到自己的申请+需要自己审批的
+     * 数据权限：填报人的同部门及上级部门的所有用户都能看到该填报人的申请信息
-     * 部门管理员可以看到部门下所有的+自己的+需要自己审批的 todo。。。
      */
     @Override
     public Page<UserReportVO> getUserReport(UserReportParam.UserReportQueryParam userReportQueryParam) {
         QueryWrapper<UserReportVO> userReportVOQueryWrapper = new QueryWrapper<>();
-
         List<String> 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);