Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

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

@@ -9,7 +9,7 @@ import cn.com.ty.lift.business.capital.service.SignInService;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.Map;
 
 /**
  * @author bieao
@@ -57,11 +58,11 @@ public class CapitalRepairController {
      */
     @PostMapping("detail")
     public RestResponse detail(@Valid @RequestBody CapitalDetailRequest request) {
-        CapitalRepair capitalRepair = capitalRepairService.detail(request.getId());
-        if (ObjectUtil.isEmpty(capitalRepair)) {
+        Map<String,Object> resultMap = capitalRepairService.detail(request.getId());
+        if (MapUtil.isEmpty(resultMap)) {
             return RestResponse.success();
         }
-        return RestResponse.success(capitalRepair, MessageUtils.get("msg.query.detail.success"));
+        return RestResponse.success(resultMap, MessageUtils.get("msg.query.detail.success"));
     }
 
     /**

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

@@ -8,6 +8,7 @@ import cn.com.ty.lift.business.capital.dao.entity.model.response.CapitalRepairRe
 import cn.com.ty.lift.business.capital.dao.mapper.CapitalRepairMapper;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import cn.com.ty.lift.business.project.service.ProjectUserService;
 import cn.com.ty.lift.common.utils.DateUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
@@ -22,7 +23,9 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
 import java.time.LocalDate;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static cn.com.ty.lift.common.constants.CommonEnum.CapitalRepairStatus;
 
@@ -52,15 +55,30 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
      * @param id 大修项目id
      * @return CapitalRepair 大修项目详情
      * @description 查询大修项目详情
-     * @date 2020/2/3 11:31 上午
+     * @date 2020/2/25 11:58 上午
      */
-    public CapitalRepair detail(Long id) {
+    public CapitalRepair getOne(Long id) {
         QueryWrapper<CapitalRepair> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<CapitalRepair> lambdaQueryWrapper = queryWrapper.lambda();
         lambdaQueryWrapper.eq(CapitalRepair::getId, id);
         return getOne(lambdaQueryWrapper);
     }
 
+    /**
+     * @param id 大修项目id
+     * @return Map<String, Object> 大修项目详情和项目组列表
+     * @description 查询大修项目详情和项目组列表
+     * @date 2020/2/3 11:31 上午
+     */
+    public Map<String, Object> detail(Long id) {
+        CapitalRepair capitalRepair = getOne(id);
+        List<ProjectUserResponse> userList = projectUserService.getUserList(id);
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("capitalRepair", capitalRepair);
+        resultMap.put("userList", userList);
+        return resultMap;
+    }
+
     /**
      * @param request 新增大修项目数据项
      * @return Integer 成功1或失败0

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -199,12 +199,9 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
     public Map<String, Object> detail(Long id) {
         Project project = getOne(id);
         List<ProjectUserResponse> userList = projectUserService.getUserList(id);
-        Optional<Long> userId = userList.stream().filter(user -> (
-                CommonEnum.DefaultRole.CLERK.getCode().equals(user.getUserRole())
-        )).map(ProjectUserResponse::getUserId).findFirst();
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("project", project);
-        resultMap.put("userId", userId);
+        resultMap.put("userList", userList);
         return resultMap;
     }