[chg]获取项目组成员列表，修改添加电梯接口

lift-business-service/src/main/java/cn/com/ty/lift/business/library/controller/LiftController.java

@@ -2,10 +2,7 @@ package cn.com.ty.lift.business.library.controller;
 
 import cn.com.ty.lift.business.library.dao.entity.Lift;
 import cn.com.ty.lift.business.library.dao.entity.ProjectLiftRelevance;
-import cn.com.ty.lift.business.library.dao.entity.model.BatchUpdateLiftRequest;
-import cn.com.ty.lift.business.library.dao.entity.model.SelectBatchPlatformCompanyRequest;
-import cn.com.ty.lift.business.library.dao.entity.model.LiftRequest;
-import cn.com.ty.lift.business.library.dao.entity.model.UpdateBatchPlatformCompanyRequest;
+import cn.com.ty.lift.business.library.dao.entity.model.*;
 import cn.com.ty.lift.business.library.service.LiftService;
 import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
 import cn.com.ty.lift.business.library.service.ProjectLiftRelevanceService;
@@ -66,14 +63,14 @@ public class LiftController {
     }
 
     /**
-     * @param lift 新增电梯数据项
+     * @param request 新增电梯数据项
      * @return 1.成功, 0.失败, 消息描述
      * @description 新增电梯
      * @date 2019/11/27 10:03 AM
      */
     @PostMapping("add")
-    public RestResponse add(@RequestBody Lift lift) {
-        return liftService.add(lift);
+    public RestResponse add(@RequestBody LiftExtensionRequest request) {
+        return liftService.add(request);
     }
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/Lift.java

@@ -1,6 +1,5 @@
 package cn.com.ty.lift.business.library.dao.entity;
 
-import cn.com.ty.lift.business.library.dao.entity.model.LiftExtensionRequest;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
@@ -14,7 +13,7 @@ import java.util.Date;
  * @since 2019-11-25 17:37:16
  */
 @Data
-public class Lift extends LiftExtensionRequest {
+public class Lift {
 
     /**
      * 电梯id

lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/model/LiftExtensionRequest.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.library.dao.entity.model;
 
+import cn.com.ty.lift.business.library.dao.entity.Lift;
 import lombok.Data;
 
 import java.util.Date;
@@ -30,4 +31,9 @@ public class LiftExtensionRequest {
      * 维保公司ID
      */
     private Long mtCompanyId;
+
+    /**
+     * 电梯
+     */
+    private Lift lift;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -5,6 +5,7 @@ import cn.com.ty.lift.business.library.dao.entity.Lift;
 import cn.com.ty.lift.business.library.dao.entity.LiftBrand;
 import cn.com.ty.lift.business.library.dao.entity.LiftExtension;
 import cn.com.ty.lift.business.library.dao.entity.PlatformCompanyLiftRelevance;
+import cn.com.ty.lift.business.library.dao.entity.model.LiftExtensionRequest;
 import cn.com.ty.lift.business.library.dao.entity.model.LiftRequest;
 import cn.com.ty.lift.business.library.dao.entity.model.LiftResponse;
 import cn.com.ty.lift.business.library.dao.mapper.LiftExtensionMapper;
@@ -24,7 +25,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -107,16 +107,17 @@ public class LiftService {
     }
 
     /**
-     * @param lift 电梯
+     * @param request 电梯
      * @return 电梯扩展实体
      * @description 初始化电梯扩展实体
      * @date 2019/12/3 3:25 PM
      */
-    private LiftExtension init(Lift lift) {
+    private LiftExtension init(LiftExtensionRequest request) {
+        Long id = request.getLift().getId();
         LiftExtension extension = new LiftExtension();
-        extension.setId(lift.getId());
-        extension.setAnnualInspectionDate(lift.getAnnualInspectionDate());
-        extension.setWorkerId(lift.getWorkerId());
+        extension.setId(id);
+        extension.setAnnualInspectionDate(request.getAnnualInspectionDate());
+        extension.setMtCompanyId(request.getMtCompanyId());
         return extension;
     }
 
@@ -134,30 +135,30 @@ public class LiftService {
     }
 
     /**
-     * @param lift 新增电梯数据项
+     * @param request 新增电梯数据项
      * @return RestResponse 状态码和返回消息
      * @description 新增电梯
      * @date 2019/11/27 2:22 PM
      */
     @Transactional
-    public RestResponse add(Lift lift) {
-        Long mtCompanyId = lift.getMtCompanyId();
+    public RestResponse add(LiftExtensionRequest request) {
+        /*Long mtCompanyId = lift.getMtCompanyId();
         if (judge(mtCompanyId))
-            return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.limit.num"));
+            return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.limit.num"));*/
         //新增电梯表
-        int liftResult = liftMapper.insert(lift);
+        int liftResult = liftMapper.insert(request.getLift());
         if (liftResult == 0) {
             return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));
         }
         //初始化电梯扩展实体
-        LiftExtension extension = init(lift);
+        LiftExtension extension = init(request);
         //新增电梯扩展表
         int extensionResult = liftExtensionMapper.insert(extension);
         if (extensionResult == 0) {
             return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));
         }
         //新增电梯来源
-        String source = lift.getSource();
+        String source = request.getSource();
         switch (source) {
             //电梯管理入口
             case "0":
@@ -175,7 +176,7 @@ public class LiftService {
                     return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));
                 }
                 //新增项目电梯关联表
-                boolean result = projectRelevanceService.save(extension, companyLiftEntry.getId(), lift.getWorkerId());
+                boolean result = projectRelevanceService.save(extension, companyLiftEntry.getId(), request.getWorkerId());
                 if (!result) {
                     return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));
                 }

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

@@ -50,9 +50,9 @@ public class ProjectController {
      * @description 查询公司项目列表
      * @date 2019/12/9 10:32 AM
      */
-    @PostMapping("companyProjectList")
-    public RestResponse companyProjectList(@RequestBody ProjectRequest request) {
-        return projectService.companyProjectList(request);
+    @PostMapping("companyList")
+    public RestResponse companyList(@RequestBody ProjectRequest request) {
+        return projectService.companyList(request);
     }
 
     /**
@@ -66,6 +66,17 @@ public class ProjectController {
         return projectService.list(request);
     }
 
+    /**
+     * @param request projectId 项目ID
+     * @return RestResponse userList项目组成员列表
+     * @description 查询项目组成员
+     * @date 2019/12/13 2:40 PM
+     */
+    @PostMapping("userList")
+    public RestResponse userList(@RequestBody ProjectRequest request) {
+        return projectService.userList(request);
+    }
+
     /**
      * @param request 项目id
      * @return RestResponse 项目详情

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/model/ProjectResponse.java

@@ -2,6 +2,8 @@ package cn.com.ty.lift.business.project.dao.entity.model;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author bieao
  * @date 2019/11/29
@@ -9,6 +11,10 @@ import lombok.Data;
  */
 @Data
 public class ProjectResponse {
+    /**
+     * 项目ID
+     */
+    private Long projectId;
     /**
      * 项目编号
      */
@@ -32,11 +38,11 @@ public class ProjectResponse {
     /**
      * 台量
      */
-    private String num;
+    private Integer num;
     /**
      * 系统台量
      */
-    private String actualNum;
+    private Integer actualNum;
     /**
      * 项目地址
      */
@@ -44,11 +50,11 @@ public class ProjectResponse {
     /**
      * 开始时间
      */
-    private String startDate;
+    private Date startDate;
     /**
      * 结束时间
      */
-    private String endDate;
+    private Date endDate;
 
     /**
      * 联系人姓名

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/mapper/ProjectHistoryMapper.java

@@ -5,8 +5,6 @@ import cn.com.ty.lift.business.project.dao.entity.model.ProjectHistoryRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import java.util.List;
-
 /**
  * @author bieao
  * @date 2019/12/09
@@ -14,5 +12,5 @@ import java.util.List;
  */
 public interface ProjectHistoryMapper extends BaseMapper<ProjectHistory> {
 
-    List<ProjectHistory> findByCondition(IPage page, ProjectHistoryRequest request);
+    IPage<ProjectHistory> findByCondition(IPage<ProjectHistory> page, ProjectHistoryRequest request);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/mapper/ProjectMapper.java

@@ -8,8 +8,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * @author bieao
  * @date 2019/12/09
@@ -17,8 +15,8 @@ import java.util.List;
  */
 public interface ProjectMapper extends BaseMapper<Project> {
 
-    List<ProjectResponse> findByCondition(IPage page, @Param("request") ProjectRequest request);
+    IPage<ProjectResponse> findByCondition(IPage<ProjectResponse> page, @Param("request") ProjectRequest request);
 
-    List<ProjectResponse> findCompanyListByCondition(IPage page, @Param("request") ProjectRequest request);
+    IPage<ProjectResponse> findCompanyListByCondition(IPage<ProjectResponse> page, @Param("request") ProjectRequest request);
 
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/mapper/ProjectUserMapper.java

@@ -3,6 +3,8 @@ package cn.com.ty.lift.business.project.dao.mapper;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * @author bieao
  * @date 2019/12/09
@@ -10,4 +12,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProjectUserMapper extends BaseMapper<ProjectUser> {
 
+    List<ProjectUser> findUserListById(Long projectId);
 }

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

@@ -16,6 +16,7 @@ import cn.com.ty.lift.common.constants.RedisConstants;
 import cn.com.ty.lift.common.export.ExportUtils;
 import cn.com.ty.lift.common.model.AreaCode;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -66,9 +67,12 @@ public class ProjectService {
      */
     public RestResponse list(ProjectRequest request) {
         IPage<ProjectResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        List<ProjectResponse> projectList = projectMapper.findByCondition(page, request);
+        if (request.getCondition() != null) {
+            request.setCondition(StrUtil.format("%{}%", request.getCondition()));
+        }
+        IPage<ProjectResponse> projects = projectMapper.findByCondition(page, request);
+        List<ProjectResponse> projectList = projects.getRecords();
         if (projectList.isEmpty()) {
-            page.setRecords(new ArrayList<>());
             return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
         }
         page.setRecords(projectList);
@@ -81,14 +85,13 @@ public class ProjectService {
      * @description 查询公司项目列表
      * @date 2019/12/9 10:32 AM
      */
-    public RestResponse companyProjectList(ProjectRequest request) {
+    public RestResponse companyList(ProjectRequest request) {
         IPage<ProjectResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        List<ProjectResponse> projectList = projectMapper.findCompanyListByCondition(page, request);
+        IPage<ProjectResponse> companyProjects = projectMapper.findCompanyListByCondition(page, request);
+        List<ProjectResponse> projectList = companyProjects.getRecords();
         if (projectList.isEmpty()) {
-            page.setRecords(new ArrayList<>());
             return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
         }
-        page.setRecords(projectList);
         return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
     }
 
@@ -100,14 +103,28 @@ public class ProjectService {
      */
     public RestResponse list(ProjectHistoryRequest request) {
         IPage<ProjectHistory> page = new Page<>(request.getPageNum(), request.getPageSize());
-        List<ProjectHistory> historyList = projectHistoryMapper.findByCondition(page, request);
+        IPage<ProjectHistory> historys = projectHistoryMapper.findByCondition(page, request);
+        List<ProjectHistory> historyList = historys.getRecords();
         if (historyList.isEmpty()) {
             return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
         }
-        page.setRecords(historyList);
         return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
     }
 
+    /**
+     * @param request projectId 项目ID
+     * @return RestResponse userList项目组成员列表
+     * @description 查询项目组成员
+     * @date 2019/12/13 2:40 PM
+     */
+    public RestResponse userList(ProjectRequest request) {
+        List<ProjectUser> userList = projectUserMapper.findUserListById(request.getProjectId());
+        if (userList.isEmpty()) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
+        }
+        return RestResponse.ok(userList, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
+    }
+
     /**
      * @param id 项目id
      * @return RestResponse 项目详情

lift-business-service/src/main/resources/mapper/project/ProjectMapper.xml

@@ -42,6 +42,7 @@
 	<!-- 根据省，市，区，区域，区域主管，项目名称、项目编号、甲方名称、项目地址查询项目管理列表-->
 	<select id="findByCondition" resultType="cn.com.ty.lift.business.project.dao.entity.model.ProjectResponse" parameterType="cn.com.ty.lift.business.project.dao.entity.model.ProjectRequest" >
 		SELECT
+		id as projectId,
 		project_code as projectCode,
 		project_name as projectName,
 		province as province,

lift-business-service/src/main/resources/mapper/project/ProjectUserMapper.xml

@@ -13,4 +13,11 @@
 		project_id, user_id, user_role, mt_company_id, is_monitor
 	</sql>
 
+	<select id="findUserListById" resultMap="BaseResultMap" parameterType="java.lang.Long">
+		select
+		<include refid="Base_Column_List"></include>
+		from project_user
+		where project_id = #{projectId,jdbcType=BIGINT}
+	</select>
+
 </mapper>