[chg]项目查询列表查询sql和返回字段修改

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

@@ -6,16 +6,19 @@ import cn.com.ty.lift.business.library.dao.entity.model.SelectBatchPlatformCompa
 import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
 import cn.com.ty.lift.business.library.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.business.project.dao.entity.Project;
+import cn.com.ty.lift.business.project.dao.entity.ProjectHistory;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectHistoryRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectIDResponse;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.ProjectResponse;
 import cn.com.ty.lift.business.project.service.ProjectService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.model.AreaCode;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -58,7 +61,12 @@ public class ProjectController {
      */
     @PostMapping("companyList")
     public RestResponse companyList(@RequestBody ProjectRequest request) {
-        return projectService.companyList(request);
+        IPage<ProjectResponse> page = projectService.companyList(request);
+        List<ProjectResponse> projectList = page.getRecords();
+        if (ObjectUtil.isEmpty(projectList)) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
+        }
+        return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
     }
 
     /**
@@ -69,7 +77,12 @@ public class ProjectController {
      */
     @PostMapping("history/list")
     public RestResponse list(@RequestBody ProjectHistoryRequest request) {
-        return projectService.list(request);
+        IPage<ProjectHistory> page = projectService.list(request);
+        List<ProjectHistory> historyList = page.getRecords();
+        if (ObjectUtil.isEmpty(historyList)) {
+            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
+        }
+        return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
     }
 
     /**
@@ -80,7 +93,11 @@ public class ProjectController {
      */
     @PostMapping("userList")
     public RestResponse userList(@RequestBody ProjectRequest request) {
-        return projectService.userList(request);
+        List<ProjectUser> userList = projectService.userList(request);
+        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"));
     }
 
     /**
@@ -138,7 +155,11 @@ public class ProjectController {
      */
     @PostMapping("add")
     public RestResponse add(@RequestBody Project project) {
-        return projectService.add(project);
+        Integer result = projectService.add(project);
+        if (result > 0) {
+            return RestResponse.ok(result, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.add.success"));
+        }
+        return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));
     }
 
     /**
@@ -149,7 +170,11 @@ public class ProjectController {
      */
     @PostMapping("worker/add")
     public RestResponse add(@RequestBody ProjectUser projectUser) {
-        return projectService.add(projectUser);
+        Integer result =  projectService.add(projectUser);
+        if (result > 0) {
+            return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.add.success"));
+        }
+        return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));
     }
 
     /**
@@ -160,7 +185,11 @@ public class ProjectController {
      */
     @PostMapping("modify")
     public RestResponse modify(@RequestBody Project project) {
-        return projectService.modify(project);
+        Integer result =  projectService.modify(project);
+        if (result > 0) {
+            return RestResponse.ok(result, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.success"));
+        }
+        return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.modify.fail"));
     }
 
     /**

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

@@ -157,4 +157,8 @@ public class Project {
      * 区域ID
      */
     private Long regionId;
+    /**
+     * 是否保存
+     */
+    private Integer save;
 }

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

@@ -48,11 +48,15 @@ public class ProjectResponse {
     /**
      * 项目用途
      */
-    private String projectUsage;
+    private Integer projectUsage;
     /**
      * 区域名称
      */
     private String regionName;
+    /**
+     * 区域id
+     */
+    private String regionId;
     /**
      * 区域主管
      */
@@ -87,4 +91,8 @@ public class ProjectResponse {
      * 联系人电话
      */
     private String contactTelephone;
+    /**
+     * 是否保存
+     */
+    private Integer save;
 }

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

@@ -83,48 +83,36 @@ public class ProjectService {
 
     /**
      * @param request 公司项目查询条件
-     * @return RestResponse 公司项目分页列表结果
+     * @return IPage<ProjectResponse> 公司项目分页列表结果
      * @description 查询公司项目列表
      * @date 2019/12/9 10:32 AM
      */
-    public RestResponse companyList(ProjectRequest request) {
+    public IPage<ProjectResponse> companyList(ProjectRequest request) {
         IPage<ProjectResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        IPage<ProjectResponse> companyProjects = projectMapper.findCompanyListByCondition(page, request);
-        List<ProjectResponse> projectList = companyProjects.getRecords();
-        if (projectList.isEmpty()) {
-            return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
-        }
-        return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
+        return projectMapper.findCompanyListByCondition(page, request);
     }
 
     /**
      * @param request 项目操作记录查询条件
-     * @return RestResponse 结果集
+     * @return IPage<ProjectHistory> 结果集
      * @description 查询项目操作记录列表
      * @date 2019/11/27 2:10 PM
      */
-    public RestResponse list(ProjectHistoryRequest request) {
+    public IPage<ProjectHistory> list(ProjectHistoryRequest request) {
         IPage<ProjectHistory> page = new Page<>(request.getPageNum(), request.getPageSize());
-        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"));
-        }
-        return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
+
+        return projectHistoryMapper.findByCondition(page, request);
+
     }
 
     /**
      * @param request projectId 项目ID
-     * @return RestResponse userList项目组成员列表
+     * @return List<ProjectUser> 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"));
+    public List<ProjectUser> userList(ProjectRequest request) {
+        return projectUserMapper.findUserListById(request.getProjectId());
     }
 
     /**
@@ -158,47 +146,35 @@ public class ProjectService {
 
     /**
      * @param project 新增项目数据项
-     * @return RestResponse 状态码和返回消息
+     * @return Integer 成功1或失败0
      * @description 新增项目
      * @date 2019/11/27 2:22 PM
      */
-    public RestResponse add(Project project) {
+    public Integer add(Project project) {
         //按当前日期时间戳自动生成项目编号
         String projectCode = DateUtils.generateCode();
         project.setProjectCode("XM" + projectCode);
-        int result = projectMapper.insert(project);
-        if (result > 0) {
-            return RestResponse.ok(result, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.add.success"));
-        }
-        return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));
+        return projectMapper.insert(project);
     }
 
     /**
      * @param projectUser 新增维保工数据项
-     * @return RestResponse 状态码和返回消息
+     * @return Integer 成功1或失败0
      * @description 新增维保工
      * @date 2019/12/4 4:41 PM
      */
-    public RestResponse add(ProjectUser projectUser) {
-        int result = projectUserMapper.insert(projectUser);
-        if (result > 0) {
-            return RestResponse.ok(result, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.add.success"));
-        }
-        return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.add.fail"));
+    public Integer add(ProjectUser projectUser) {
+        return projectUserMapper.insert(projectUser);
     }
 
     /**
      * @param project 修改项目数据项
-     * @return RestResponse 状态码和返回消息
+     * @return Integer 成功1或失败0
      * @description 修改项目
      * @date 2019/11/27 2:22 PM
      */
-    public RestResponse modify(Project project) {
-        int result = projectMapper.updateById(project);
-        if (result > 0) {
-            return RestResponse.ok(result, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.success"));
-        }
-        return RestResponse.error(ApiConstants.RESULT_ERROR, MessageUtils.get("msg.modify.fail"));
+    public Integer modify(Project project) {
+        return projectMapper.updateById(project);
     }
 
     /**

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

@@ -54,8 +54,10 @@
         p.address       as address,
         p.start_date    as startDate,
         p.end_date      as endDate,
+		p.region_id     as regionId,
 		p.pp_company_id as ppCompanyId,
 		p.pp_contact_id as ppContactId,
+		p.save          as save,
         r.area_name     as regionName,
         ui.name         as userName,
         pc.name         as companyName
@@ -65,27 +67,27 @@
         LEFT JOIN property_company pc ON p.pp_company_id = pc.id
         WHERE 1 = 1
 		<if test="request.provinceCode!=null and request.provinceCode!=''">
-			and province_code= #{request.provinceCode,jdbcType=VARCHAR}
+			and p.province_code= #{request.provinceCode,jdbcType=VARCHAR}
 		</if>
 		<if test="request.cityCode!=null and request.cityCode!=''">
-			and city_code = #{request.cityCode,jdbcType=VARCHAR}
+			and p.city_code = #{request.cityCode,jdbcType=VARCHAR}
 		</if>
 		<if test="request.districtCode!=null and request.districtCode!=''">
-			and district_code = #{request.districtCode,jdbcType=VARCHAR}
+			and p.district_code = #{request.districtCode,jdbcType=VARCHAR}
 		</if>
 		<if test="request.regionId!=null and request.regionId!=''">
-			and region_id = #{request.regionId,jdbcType=BIGINT}
+			and p.region_id = #{request.regionId,jdbcType=BIGINT}
 		</if>
         <if test="request.userId!=null and request.userId!=''">
             and r.user_id = #{request.userId,jdbcType=BIGINT}
         </if>
 		<if test="request.condition!=null and request.condition!=''">
-			and (project_name like #{request.condition,jdbcType=VARCHAR}
-			or project_code like #{request.condition,jdbcType=VARCHAR}
-			or address like #{request.condition,jdbcType=VARCHAR})
+			and (p.project_name like #{request.condition,jdbcType=VARCHAR}
+			or p.project_code like #{request.condition,jdbcType=VARCHAR}
+			or p.address like #{request.condition,jdbcType=VARCHAR})
 		</if>
 		<if test="request.projectStatus!=null and request.projectStatus!=''">
-			and project_status = #{request.projectStatus,jdbcType=VARCHAR}
+			and p.project_status = #{request.projectStatus,jdbcType=VARCHAR}
 		</if>
 	</select>