大修项目组成员列表

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/controller/CapitalRepairController.java

@@ -7,6 +7,8 @@ import cn.com.ty.lift.business.capital.dao.entity.model.response.SignInResponse;
 import cn.com.ty.lift.business.capital.service.CapitalRepairService;
 import cn.com.ty.lift.business.capital.service.SignInService;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
+import cn.com.ty.lift.business.project.service.ProjectUserService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -36,6 +39,9 @@ public class CapitalRepairController {
     @Resource
     private SignInService signInService;
 
+    @Resource
+    private ProjectUserService projectUserService;
+
     /**
      * @param request 大修项目列表查询条件
      * @return RestResponse 结果集
@@ -122,11 +128,26 @@ public class CapitalRepairController {
         return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
     }
 
+    /**
+     * @param request 项目id，公司id
+     * @return List<ProjectUserResponse> 大修项目组成员列表
+     * @description 查询大修项目组成员
+     * @date 2020/4/18 12:45 下午
+     */
+    @PostMapping("userList")
+    public RestResponse userList(@Valid @RequestBody CapitalDetailRequest request){
+        List<ProjectUserResponse> userList = projectUserService.getUserList(request.getId(), request.getMtCompanyId());
+        if (CollUtil.isEmpty(userList)) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(userList, MessageUtils.get("msg.query.success"));
+    }
+
     /**
      * @param request 大修签到查询条件
      * @return RestResponse 结果集
      * @description 条件查询大修项目签到列表
-     * @date 2020/2/5 12:58 下午
+     * @date 2020/4/16 7:22 下午
      */
     @PostMapping("signIn/record")
     public RestResponse signInRecord(@RequestBody SignInRequest request) {

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/entity/model/request/CapitalDetailRequest.java

@@ -21,4 +21,10 @@ public class CapitalDetailRequest extends PageRequest {
     @NotNull(message = "notEmpty")
     private Long id;
 
+    /**
+     * 公司ID
+     */
+    @NotNull(message = "notEmpty")
+    private Long mtCompanyId;
+
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/entity/model/request/SignInRequest.java

@@ -26,7 +26,7 @@ public class SignInRequest extends PageRequest {
      * 大修项目id
      */
     @NotNull(message = "notEmpty")
-    private Long projectId;
+    private Long id;
 
     /**
      * 签到日期

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/SignInService.java

@@ -94,10 +94,10 @@ public class SignInService extends ServiceImpl<SignInMapper, SignIn> {
      * @param request 大修签到查询条件
      * @return RestResponse 结果集
      * @description 条件查询大修项目签到列表
-     * @date 2020/2/5 12:58 下午
+     * @date 2020/4/16 7:22 下午
      */
     public SignInResponse list(SignInRequest request) {
-        CapitalRepair capital = capitalRepairService.getOne(request.getProjectId());
+        CapitalRepair capital = capitalRepairService.getOne(request.getId());
         SignInResponse response = new SignInResponse();
         response.setCapitalRepair(capital);
         IPage<SignRecord> signRecord = baseMapper.findByCondition(request.getPage(), request);