From ff05c270d5490d9cc32ac7f1e01703417f292730 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 05 三月 2024 14:10:09 +0800
Subject: [PATCH] 运维单位优化
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
index 0864f1c..aa78591 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java
@@ -12,12 +12,16 @@
import com.ycl.system.page.PageUtil;
import com.ycl.platform.service.YwUnitService;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.utils.DateUtils;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
import org.springframework.util.Assert;
+
+import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
+import org.springframework.util.StringUtils;
/**
* 杩愮淮鍗曚綅 鏈嶅姟瀹炵幇绫�
@@ -98,8 +102,14 @@
*/
@Override
public Result page(YwUnitQuery query) {
-
+ // 鍒嗛〉鏉′欢鏌ヨ浣�
IPage<YwUnit> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(StringUtils.hasText(query.getUnitCode()), YwUnit::getUnitCode, query.getUnitCode())
+ .eq(StringUtils.hasText(query.getUnitName()), YwUnit::getUnitName, query.getUnitName())
+ .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
+ YwUnit::getCreateTime,
+ DateUtils.getDayStart(query.getStart()),
+ DateUtils.getDayEnd(query.getEnd()))
.orderByDesc(YwUnit::getCreateTime)
.page(PageUtil.getPage(query, YwUnit.class));
--
Gitblit v1.8.0