流转工作流程

pqs-supervision/supervision-boot/pom.xml

@@ -30,6 +30,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>user-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>common-web</artifactId>

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/user/UserReportManageController.java

@@ -1,6 +1,7 @@
 package com.njcn.supervision.controller.user;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.bpm.pojo.po.BpmForm;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -14,6 +15,8 @@ import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -39,7 +42,7 @@ public class UserReportManageController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD)
     @PostMapping("/add")
-    @ApiOperation("新增干扰源用户（未建档干扰源用户管理）")
+    @ApiOperation("新增干扰源用户")
     @ApiImplicitParam(name = "userReportParam", value = "实体参数", required = true)
     public HttpResult<String> addUserReport(@RequestBody @Validated UserReportParam userReportParam){
         String methodDescribe = getMethodDescribe("addUserReport");
@@ -50,7 +53,7 @@ public class UserReportManageController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType= OperateType.ADD)
     @PostMapping("/auditUserReport")
-    @ApiOperation("修改干扰源用户（未建档干扰源用户管理）")
+    @ApiOperation("修改干扰源用户")
     @ApiImplicitParam(name = "userReportUpdate", value = "实体参数", required = true)
     public HttpResult<Boolean> auditUserReport(@RequestBody @Validated UserReportParam.UserReportUpdate userReportUpdate){
         String methodDescribe = getMethodDescribe("auditUserReport");
@@ -80,4 +83,13 @@ public class UserReportManageController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
 
+    @GetMapping("/getById")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @Operation(summary = "根据id获取用户档案录入的详细数据")
+    public HttpResult<UserReportVO> getById(String id) {
+        String methodDescribe = getMethodDescribe("getById");
+        UserReportVO userReportVO = userReportPOService.getVOById(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportVO, methodDescribe);
+    }
+
 }

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

@@ -25,4 +25,6 @@ public interface UserReportPOService extends IService<UserReportPO> {
     Page<UserReportVO> getUserReport(UserReportParam.UserReportQueryParam userReportQueryParam);
 
     Boolean removeUserReport(List<String> ids);
+
+    UserReportVO getVOById(String id);
 }

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

@@ -1,5 +1,6 @@
 package com.njcn.supervision.service.user.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -23,6 +24,9 @@ import com.njcn.supervision.service.user.UserReportPOService;
 import com.njcn.supervision.service.user.UserReportProjectPOService;
 import com.njcn.supervision.service.user.UserReportSensitivePOService;
 import com.njcn.supervision.service.user.UserReportSubstationPOService;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.api.UserFeignClient;
+import com.njcn.user.pojo.vo.UserVO;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
@@ -55,6 +59,8 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
     private final UserReportSubstationPOService userReportSubstationPOService;
     private final UserReportSensitivePOService userReportSensitivePOService;
     private final BpmProcessFeignClient bpmProcessFeignClient;
+    private final UserFeignClient userFeignClient;
+    private final DeptFeignClient deptFeignClient;
 
 
 
@@ -107,7 +113,6 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
         // 将工作流的编号，更新到流程单中
         userReportPO.setProcessInstanceId(processInstanceId);
         this.baseMapper.updateById(userReportPO);
-
         return userReportPO.getId();
     }
 
@@ -167,6 +172,25 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
         return true;
     }
 
+    @Override
+    public UserReportVO getVOById(String id) {
+        UserReportVO userReportVO = new UserReportVO();
+        UserReportPO userReportPO = this.baseMapper.selectById(id);
+        //复制基础信息
+        BeanUtil.copyProperties(userReportPO,userReportVO);
+        //处理特殊字段，用户名、部门名
+        UserVO userVO = userFeignClient.getUserById(userReportPO.getReporter()).getData();
+        userReportVO.setReporter(userVO.getName());
+        userReportVO.setOrgName(deptFeignClient.getDeptById(userReportPO.getOrgId()).getData().getName());
+        /*
+            根据用户性质获取自己特有的字段，此处需要特殊处理
+            1、每个附件需要返回文件名称以及可以预览的url
+            todo...by黄正剑
+         */
+        userReportVO.setUserReportProjectPO(new UserReportProjectPO());
+        return userReportVO;
+    }
+
 
     /**
      * 获取所有字段为null的属性名