#检修时间筛选

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/dto/OperAccessPlanListDTO.java

@@ -1,6 +1,7 @@
 package com.hnac.hzims.operational.access.dto;
 
 import com.hnac.hzims.operational.access.entity.OperAccessPlanEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -16,4 +17,10 @@ public class OperAccessPlanListDTO extends OperAccessPlanEntity {
 
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "开始时间")
+	private String startDate;
+
+	@ApiModelProperty(value = "结束时间")
+	private String endDate;
+
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessPlanServiceImpl.java

@@ -1,9 +1,7 @@
 package com.hnac.hzims.operational.access.service.impl;
 
-import cn.hutool.core.io.unit.DataUnit;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -20,17 +18,14 @@ import com.hnac.hzims.operational.access.vo.OperAccessContentVO;
 import com.hnac.hzims.operational.access.vo.OperAccessPlanVO;
 import com.hnac.hzims.operational.access.wrapper.OperAccessContentDetailWrapper;
 import com.hnac.hzims.operational.access.wrapper.OperAccessContentWrapper;
-import com.hnac.hzims.operational.access.wrapper.OperAccessMaterialWrapper;
 import com.hnac.hzims.operational.access.wrapper.OperAccessPlanWrapper;
 import com.hnac.hzims.operational.defect.constants.RepairConstant;
 import com.hnac.hzims.operational.defect.constants.TreatMethodConstant;
 import com.hnac.hzims.operational.defect.entity.OperDefectEntity;
 import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity;
-import com.hnac.hzims.operational.defect.mapper.OperDefectMapper;
 import com.hnac.hzims.operational.defect.mapper.OperPhenomenonMapper;
 import com.hnac.hzims.operational.defect.service.IOperDefectService;
 import com.hnac.hzims.operational.util.WordUtils;
-import com.hnac.hzims.spare.entity.WtSpTotalEntity;
 import com.hnac.hzims.ticket.constants.TicketConstants;
 import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity;
 import com.hnac.hzims.ticket.workTicket.entity.WorkTicketTemplateEntity;
@@ -39,7 +34,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.RandomUtils;
-import org.jsoup.helper.DataUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
@@ -60,13 +54,12 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+
 import javax.servlet.http.HttpServletResponse;
 import java.text.DecimalFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 /**
@@ -445,6 +438,12 @@ public class OperAccessPlanServiceImpl extends BaseServiceImpl<OperAccessPlanMap
 			if (StringUtils.isNotBlank(req.getHandleStatus())) {
 				eq(OperAccessPlanEntity::getHandleStatus, req.getHandleStatus());
 			}
+			if (StringUtils.isNotEmpty(req.getStartDate())) {
+				ge(OperAccessPlanEntity::getActStartTime, req.getStartDate());
+			}
+			if (StringUtils.isNotBlank(req.getEndDate())) {
+				le(OperAccessPlanEntity::getActStartTime, req.getEndDate());
+			}
 		}};
 
 		IPage pages = super.page(Condition.getPage(query), queryWrapper);