DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2025-11-25 14:41:38 +08:00
parent d9fcfe35d1 14bce9dfef
commit b1b67607e0
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
klp-pocket/src/main/java/com/klp/pocket/service/impl/Klptcm1ProStoppageServiceImpl.java
View File

@@ -16,7 +16,12 @@ import com.klp.pocket.domain.Klptcm1ProStoppage;
import com.klp.pocket.mapper.Klptcm1ProStoppageMapper;
import com.klp.pocket.service.IKlptcm1ProStoppageService;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -75,8 +80,17 @@ public class Klptcm1ProStoppageServiceImpl implements IKlptcm1ProStoppageService
// bo.startDate 是查询开始时间，stoppage.startDate 是停机开始时间
lqw.ge(bo.getStartDate() != null, Klptcm1ProStoppage::getStartDate, bo.getStartDate());
// bo.endDate 是查询结束时间，stoppage.startDate 是停机开始时间
lqw.le(bo.getEndDate() != null, Klptcm1ProStoppage::getStartDate, bo.getEndDate());
// 如果结束日期存在，将其设置为当天的最后一刻（23:59:59.999），以覆盖整天的查询
if (bo.getEndDate() != null) {
Date endDate = bo.getEndDate();
LocalDate localDate = endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
LocalDateTime endOfDay = LocalDateTime.of(localDate, LocalTime.MAX);
Date endDateWithTime = Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
lqw.le(Klptcm1ProStoppage::getStartDate, endDateWithTime);
}
lqw.eq(bo.getDURATION() != null, Klptcm1ProStoppage::getDuration, bo.getDURATION());
// 只查询持续时间大于等于5分钟（300秒）的停机记录
lqw.ge(Klptcm1ProStoppage::getDuration, 300);
lqw.eq(bo.getInsDate() != null, Klptcm1ProStoppage::getInsDate, bo.getInsDate());
lqw.eq(StringUtils.isNotBlank(bo.getStopType()), Klptcm1ProStoppage::getStopType, bo.getStopType());
//倒序