维保详情列表增加当年时间筛选

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

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.maintenance.dao.entity.model.request;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
 
 /**
  * @author bieao
@@ -27,4 +28,16 @@ public class MaintenanceDetailRequest {
      */
     @NotNull(message = "notEmpty")
     private Long liftId;
+
+    /**
+     * 开始时间
+     */
+    @NotNull(message = "notEmpty")
+    private LocalDate beginTime;
+
+    /**
+     * 结束时间
+     */
+    @NotNull(message = "notEmpty")
+    private LocalDate endTime;
 }

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

@@ -13,6 +13,7 @@ import cn.com.ty.lift.business.project.dao.entity.Project;
 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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -74,11 +75,13 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      * @date 2020/1/2 9:43 上午
      */
     public List<MaintenancePlan> detailList(MaintenanceDetailRequest request) {
-        Map<String, Object> paramMap = new HashMap<>(3);
-        paramMap.put("mt_company_id", request.getMtCompanyId());
-        paramMap.put("project_id", request.getProjectId());
-        paramMap.put("lift_id", request.getLiftId());
-        return planMapper.selectByMap(paramMap);
+        QueryWrapper<MaintenancePlan> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<MaintenancePlan> lambdaQueryWrapper = queryWrapper.lambda();
+        lambdaQueryWrapper.eq(MaintenancePlan::getMtCompanyId, request.getMtCompanyId());
+        lambdaQueryWrapper.eq(MaintenancePlan::getProjectId, request.getProjectId());
+        lambdaQueryWrapper.eq(MaintenancePlan::getLiftId, request.getLiftId());
+        lambdaQueryWrapper.between(MaintenancePlan::getPlanDate, request.getBeginTime(), request.getEndTime());
+        return list(lambdaQueryWrapper);
     }
 
     /**