技术监督bug

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvPlanParam.java

@@ -149,6 +149,9 @@ public class SupvPlanParam extends BaseParam {
     @ApiModelProperty(value = "实施状态")
     private String  effectStatus;
 
+    @ApiModelProperty(value = "实施人")
+    private String effectUserId;
+
 
     @EqualsAndHashCode(callSuper = true)
     @Data

pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvProblemParam.java

@@ -149,6 +149,10 @@ public class SupvProblemParam extends BaseParam {
     @NotBlank(message = "整改情况不可为空")
     private String rectificationStatus;
 
+    @NotBlank(message = "问题发现时间")
+    @DateTimeStrValid(message = "问题发现时间格式有误")
+    private String discoveryTime;
+
     @EqualsAndHashCode(callSuper = true)
     @Data
     public static class UpdateSupvProblemParam extends SupvProblemParam{

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java

@@ -47,6 +47,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
@@ -95,6 +96,12 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
 
         supvPlan.setIsUploadHead(0);
         supvPlan.setPlanUserId(RequestUtil.getUserIndex());
+        if(StrUtil.isNotBlank(supvPlan.getEffectUserId())){
+            List<User> userList = userFeignClient.getUserByIdList(Stream.of(supvPlan.getEffectUserId()).collect(Collectors.toList())).getData();
+            if(CollUtil.isNotEmpty(userList)){
+                supvPlan.setEffectUserName(userList.get(0).getName());
+            }
+        }
         this.save(supvPlan);
         return true;
     }
@@ -117,6 +124,12 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
         if(StrUtil.isNotBlank(supvPlanParam.getReportIssueTime())) {
             supvPlan.setReportIssueTime(PubUtils.localDateTimeFormat(supvPlanParam.getReportIssueTime()));
         }
+        if(StrUtil.isNotBlank(supvPlan.getEffectUserId())){
+            List<User> userList = userFeignClient.getUserByIdList(Stream.of(supvPlan.getEffectUserId()).collect(Collectors.toList())).getData();
+            if(CollUtil.isNotEmpty(userList)){
+                supvPlan.setEffectUserName(userList.get(0).getName());
+            }
+        }
         this.updateById(supvPlan);
         return true;
     }

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

@@ -399,7 +399,7 @@ public class UserController extends BaseController {
      * @date 2023/7/31
      */
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @PostMapping("/getUserListByDeptId")
+    @GetMapping("/getUserListByDeptId")
     @ApiOperation("根据用户id集合查询用户信息")
     @ApiImplicitParam(name = "deptId", value = "用户部门id", required = true)
     public HttpResult<List<User>> getUserListByDeptId(@RequestParam("deptId") String deptId) {

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

@@ -474,14 +474,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Override
     public List<User> getUserListByDeptId(String deptId) {
         LambdaQueryWrapper<Dept> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.like(Dept::getPids,deptId);
+        lambdaQueryWrapper.like(Dept::getPids,deptId).select(Dept::getId);
         List<String> deptIds = new ArrayList<>();
         deptIds.add(deptId);
         List<Dept> deptList = deptService.list(lambdaQueryWrapper);
         if(CollectionUtil.isNotEmpty(deptIds)){
             deptIds.addAll(deptList.stream().map(Dept::getId).distinct().collect(Collectors.toList()));
         }
-        return this.list(new LambdaQueryWrapper<User>().in(User::getDeptId,deptIds));
+        return this.list(new LambdaQueryWrapper<User>().in(User::getDeptId,deptIds).select(User::getId,User::getName,User::getLoginName));
     }
 
     /**