[chg]维保计划查询

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

@@ -1,6 +1,8 @@
 package cn.com.ty.lift.business.library.dao.entity.model;
 
+import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author bieao
@@ -8,7 +10,8 @@ import lombok.Data;
  * @description 电梯档案列表请求体
  */
 @Data
-public class LiftRequest {
+@EqualsAndHashCode(callSuper = true)
+public class LiftRequest extends BaseRequestModel {
 
     /**
      * 电梯状态（服务中：1，停止：0）
@@ -54,14 +57,4 @@ public class LiftRequest {
      * 公司ID
      */
     private Long companyId;
-
-    /**
-     * 当前第几页
-     */
-    private Integer pageNum;
-
-    /**
-     * 每页条数
-     */
-    private Integer pageSize;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/MaintenanceController.java

@@ -2,12 +2,14 @@ package cn.com.ty.lift.business.maintenance.controller;
 
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanRequest;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.UpdateMaintenancePlanReq;
 import cn.com.ty.lift.business.maintenance.service.MaintenancePlanService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.ty.lift.common.constants.ApiConstants;
 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +29,21 @@ public class MaintenanceController {
     @Resource
     private MaintenancePlanService maintenancePlanService;
 
+    /**
+     * @param request 维保计划列表
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 查询维保计划
+     * @date 2019/12/24 10:47 AM
+     */
+    @PostMapping("plan/list")
+    public RestResponse list(@RequestBody MaintenancePlanRequest request) {
+        IPage<MaintenancePlanResponse> page = maintenancePlanService.list(request);
+        if (ObjectUtil.isEmpty(page.getRecords())) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(page, MessageUtils.get("msg.query.success"));
+    }
+
     /**
      * @param request 电梯列表
      * @return 1.成功, 0.失败, 消息描述
@@ -44,7 +61,7 @@ public class MaintenanceController {
     }
 
     /**
-     * @param request 电梯列表
+     * @param request 修改维保计划请求
      * @return 1.成功, 0.失败, 消息描述
      * @description 修改维保计划
      * @date 2019/12/16 2:36 PM

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/MaintenancePlanRequest.java

@@ -2,6 +2,7 @@ package cn.com.ty.lift.business.maintenance.dao.entity.model;
 
 import cn.com.ty.lift.business.library.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
+import cn.com.xwy.boot.controller.BaseRequestModel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -14,7 +15,7 @@ import java.util.List;
  * @description 维保计划列表请求体
  */
 @Data
-public class MaintenancePlanRequest {
+public class MaintenancePlanRequest extends BaseRequestModel {
     /**
      * 电梯列表
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/MaintenancePlanResponse.java

@@ -65,4 +65,8 @@ public class MaintenancePlanResponse {
      * 区域名称
      */
     private String regionName;
+    /**
+     * 维保工
+     */
+    private String workerName;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/MaintenancePlanMapper.java

@@ -1,7 +1,11 @@
 package cn.com.ty.lift.business.maintenance.dao.mapper;
 
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanRequest;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
@@ -14,4 +18,6 @@ import java.util.List;
 public interface MaintenancePlanMapper extends BaseMapper<MaintenancePlan> {
 
     List<MaintenancePlan> findIdList(Date currentTime);
+
+    IPage<MaintenancePlanResponse> findByCondition(IPage page, @Param("request") MaintenancePlanRequest request);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenancePlanService.java

@@ -4,6 +4,7 @@ import cn.com.ty.lift.business.library.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.library.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanRequest;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenancePlanResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.UpdateMaintenancePlanReq;
 import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenancePlanMapper;
 import cn.com.ty.lift.business.project.dao.entity.Project;
@@ -11,6 +12,8 @@ import cn.com.ty.lift.business.project.service.ProjectService;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.ty.lift.common.export.ExportUtils;
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -49,6 +52,17 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         put("planDate", "计划时间");
     }};
 
+    /**
+     * @param request 维保计划列表
+     * @return 1.成功, 0.失败, 消息描述
+     * @description 查询维保计划
+     * @date 2019/12/24 10:47 AM
+     */
+    public IPage<MaintenancePlanResponse> list(MaintenancePlanRequest request) {
+        IPage<MaintenancePlanResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return planMapper.findByCondition(page, request);
+    }
+
     /**
      * @param request 电梯列表
      * @return 是否成功

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

@@ -8,7 +8,6 @@ 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;
@@ -78,8 +77,8 @@ public class ProjectController {
      * @date 2019/12/2 11:41 AM
      */
     @PostMapping("history/list")
-    public RestResponse list(@RequestBody ProjectHistoryRequest request) {
-        IPage<ProjectHistory> page = projectService.list(request);
+    public RestResponse historyList(@RequestBody ProjectRequest request) {
+        IPage<ProjectHistory> page = projectService.historyList(request);
         if (ObjectUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
         }

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

@@ -1,27 +0,0 @@
-package cn.com.ty.lift.business.project.dao.entity.model;
-
-import lombok.Data;
-
-/**
- * @author bieao
- * @date 2019/12/2
- * @description 项目操作记录列表请求体
- */
-@Data
-public class ProjectHistoryRequest {
-
-    /**
-     * 项目编号
-     */
-    private String projectCode;
-
-    /**
-     * 当前页码
-     */
-    private int pageNum;
-
-    /**
-     * 每页条数
-     */
-    private int pageSize;
-}

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

@@ -1,6 +1,8 @@
 package cn.com.ty.lift.business.project.dao.entity.model;
 
+import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author bieao
@@ -8,7 +10,8 @@ import lombok.Data;
  * @description 项目管理列表请求体
  */
 @Data
-public class ProjectRequest {
+@EqualsAndHashCode(callSuper = true)
+public class ProjectRequest extends BaseRequestModel {
     /**
      * 省编码
      */
@@ -58,14 +61,4 @@ public class ProjectRequest {
      * 维保公司id
      */
     private String mtCompanyId;
-
-    /**
-     * 当前页码
-     */
-    private Integer pageNum;
-
-    /**
-     * 每页条数
-     */
-    private Integer pageSize;
 }

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

@@ -1,7 +1,7 @@
 package cn.com.ty.lift.business.project.dao.mapper;
 
 import cn.com.ty.lift.business.project.dao.entity.ProjectHistory;
-import cn.com.ty.lift.business.project.dao.entity.model.ProjectHistoryRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.ProjectRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
@@ -12,5 +12,5 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  */
 public interface ProjectHistoryMapper extends BaseMapper<ProjectHistory> {
 
-    IPage<ProjectHistory> findByCondition(IPage<ProjectHistory> page, ProjectHistoryRequest request);
+    IPage<ProjectHistory> findByCondition(IPage<ProjectHistory> page, ProjectRequest request);
 }

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

@@ -3,7 +3,6 @@ package cn.com.ty.lift.business.project.service;
 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;
@@ -83,11 +82,9 @@ public class ProjectService {
      * @description 查询项目操作记录列表
      * @date 2019/11/27 2:10 PM
      */
-    public IPage<ProjectHistory> list(ProjectHistoryRequest request) {
+    public IPage<ProjectHistory> historyList(ProjectRequest request) {
         IPage<ProjectHistory> page = new Page<>(request.getPageNum(), request.getPageSize());
-
         return projectHistoryMapper.findByCondition(page, request);
-
     }
 
     /**

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

@@ -22,7 +22,7 @@
         select
         <include refid="Base_Column_List"/>
         from project_history
-        where id = #{id,jdbcType=BIGINT}
+        where id = #{request.id,jdbcType=BIGINT}
     </select>
 
 </mapper>