分页代码修改

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/entity/model/ContractRequest.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.contract.dao.entity.model;
 
+import cn.com.ty.lift.common.model.PageRequest;
 import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +14,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ContractRequest extends BaseRequestModel {
+public class ContractRequest extends PageRequest {
 
     /**
      * 公司id
@@ -27,7 +28,7 @@ public class ContractRequest extends BaseRequestModel {
     /**
      * 合同编号
      */
-    private String contractId;
+    private String contractCode;
     /**
      * 合同类型
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/ContractService.java

@@ -58,14 +58,7 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
      * @date 2019/12/7 11:53 AM
      */
     public IPage<ContractResponse> list(ContractRequest request) {
-        IPage<ContractResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        if (ObjectUtil.isNotEmpty(request.getContractId())) {
-            request.setContractId(StrUtil.format("%{}%", request.getContractId()));
-        }
-        if (ObjectUtil.isNotEmpty(request.getProjectName())) {
-            request.setProjectName(StrUtil.format("%{}%", request.getProjectName()));
-        }
-        return contractsMapper.findByCondition(page, request);
+        return contractsMapper.findByCondition(request.getPage(), request);
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.library.dao.entity.model.request;
 
+import cn.com.ty.lift.common.model.PageRequest;
 import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +14,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class LiftChooseRequest extends BaseRequestModel {
+public class LiftChooseRequest extends PageRequest {
     /**
      * 公司ID
      */

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

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.library.dao.entity.model.request;
 
+import cn.com.ty.lift.common.model.PageRequest;
 import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +12,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class LiftRequest extends BaseRequestModel {
+public class LiftRequest extends PageRequest {
 
     /**
      * 电梯状态（服务中：1，停止：0）

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

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.library.dao.entity.model.request;
 
+import cn.com.ty.lift.common.model.PageRequest;
 import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +14,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProjectLiftRequest extends BaseRequestModel {
+public class ProjectLiftRequest extends PageRequest {
     /**
      * 公司ID
      */

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

@@ -73,8 +73,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      * @date 2019/11/27 2:10 PM
      */
     public IPage<LiftResponse> list(LiftRequest request) {
-        IPage<LiftResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return baseMapper.findByCondition(page, request);
+        return baseMapper.findByCondition(request.getPage(), request);
     }
 
     /**
@@ -84,8 +83,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      * @date 2019/12/17 11:04 AM
      */
     public IPage<LiftResponse> liftProjectList(ProjectLiftRequest request) {
-        IPage<LiftResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return baseMapper.findLiftListByProjectId(page, request);
+        return baseMapper.findLiftListByProjectId(request.getPage(), request);
     }
 
     /**
@@ -95,8 +93,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      * @date 2019/12/30 10:42 AM
      */
     public IPage<LiftResponse> choose(LiftChooseRequest request) {
-        IPage<LiftResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return baseMapper.chooseLiftList(page, request);
+        return baseMapper.chooseLiftList(request.getPage(), request);
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.maintenance.dao.entity.model.request;
 
+import cn.com.ty.lift.common.model.PageRequest;
 import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +12,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class MaintenancePlanRequest extends BaseRequestModel {
+public class MaintenancePlanRequest extends PageRequest {
     /**
      * 项目id
      */

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

@@ -73,8 +73,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      * @date 2019/12/24 10:47 AM
      */
     public IPage<MaintenancePlanResponse> list(MaintenancePlanRequest request) {
-        IPage<MaintenancePlanResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return baseMapper.findByCondition(page, request);
+        return baseMapper.findByCondition(request.getPage(), request);
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.project.dao.entity.model.request;
 
+import cn.com.ty.lift.common.model.PageRequest;
 import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,7 +15,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProjectCompanyRequest extends BaseRequestModel {
+public class ProjectCompanyRequest extends PageRequest {
 
 
     /**

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

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.project.dao.entity.model.request;
 
+import cn.com.ty.lift.common.model.PageRequest;
 import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +14,7 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProjectRequest extends BaseRequestModel {
+public class ProjectRequest extends PageRequest {
     /**
      * 省编码
      */

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

@@ -84,11 +84,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      * @date 2019/11/27 2:10 PM
      */
     public IPage<ProjectResponse> list(ProjectRequest request) {
-        IPage<ProjectResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        if (request.getCondition() != null) {
-            request.setCondition(StrUtil.format("%{}%", request.getCondition()));
-        }
-        return baseMapper.findByCondition(page, request);
+        return baseMapper.findByCondition(request.getPage(), request);
     }
 
     /**
@@ -140,8 +136,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      * @date 2019/12/9 10:32 AM
      */
     public IPage<ProjectResponse> companyList(ProjectCompanyRequest request) {
-        IPage<ProjectResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return baseMapper.findCompanyListByCondition(page, request);
+        return baseMapper.findCompanyListByCondition(request.getPage(), request);
     }
 
     /**
@@ -151,8 +146,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      * @date 2019/11/27 2:10 PM
      */
     public IPage<ProjectHistory> historyList(ProjectRequest request) {
-        IPage<ProjectHistory> page = new Page<>(request.getPageNum(), request.getPageSize());
-        return projectHistoryMapper.findByCondition(page, request);
+        return projectHistoryMapper.findByCondition(request.getPage(), request);
     }
 
     /**

lift-business-service/src/main/resources/mapper/contract/ContractsMapper.xml

@@ -51,8 +51,8 @@
             FROM contracts c
         LEFT JOIN project p ON c.project_id = p.id
         WHERE c.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
-        <if test="request.contractId!=null and request.contractId!=''">
-            AND c.next_id LIKE #{request.contractId,jdbcType=BIGINT}
+        <if test="request.contractCode!=null and request.contractCode!=''">
+            AND c.code LIKE CONCAT('%',#{request.contractCode,jdbcType=BIGINT},'%')
         </if>
         <if test="request.contractType!=null and request.contractType!=''">
             AND c.type = #{request.contractType,jdbcType=INTEGER}
@@ -61,7 +61,7 @@
             AND c.status = #{request.contractStatus,jdbcType=INTEGER}
         </if>
         <if test="request.projectName!=null and request.projectName!=''">
-            AND p.project_name LIKE #{request.projectName,jdbcType=VARCHAR}
+            AND p.project_name LIKE CONCAT('%',#{request.projectName,jdbcType=VARCHAR},'%')
         </if>
     </select>
 

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

@@ -86,9 +86,9 @@
 			AND r.user_id = #{request.userId,jdbcType=BIGINT}
         </if>
 		<if test="request.condition!=null and request.condition!=''">
-			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})
+			AND (p.project_name LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%')
+			OR p.project_code LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%')
+			OR p.address LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%'))
 		</if>
 		<if test="request.projectStatus!=null and request.projectStatus!=''">
 			AND p.project_status = #{request.projectStatus,jdbcType=VARCHAR}