From c4dfb5b30a5b2917c259f40c1c80abb28b504990 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期一, 25 三月 2024 15:41:23 +0800
Subject: [PATCH] 工单阈值

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 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 aa78591..0e50ba3 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
@@ -1,8 +1,11 @@
 package com.ycl.platform.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.HashMap;
 import java.util.List;
 
+import com.ycl.platform.base.BaseSelect;
 import com.ycl.platform.domain.entity.YwUnit;
 import com.ycl.platform.domain.form.YwUnitForm;
 import com.ycl.platform.domain.query.YwUnitQuery;
@@ -105,7 +108,7 @@
         // 鍒嗛〉鏉′欢鏌ヨ浣�
         IPage<YwUnit> page = new LambdaQueryChainWrapper<>(baseMapper)
                 .eq(StringUtils.hasText(query.getUnitCode()), YwUnit::getUnitCode, query.getUnitCode())
-                .eq(StringUtils.hasText(query.getUnitName()), YwUnit::getUnitName, query.getUnitName())
+                .like(StringUtils.hasText(query.getUnitName()), YwUnit::getUnitName, query.getUnitName())
                 .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
                         YwUnit::getCreateTime,
                         DateUtils.getDayStart(query.getStart()),
@@ -142,9 +145,15 @@
     @Override
     public Result all() {
         List<YwUnit> entities = baseMapper.selectList(null);
-        List<YwUnitVO> vos = entities.stream()
+
+        List<BaseSelect> vos = entities.stream()
                 .map(
-                        entity -> YwUnitVO.getVoByEntity(entity, null)
+                        entity -> {
+                            BaseSelect baseSelect = new BaseSelect();
+                            baseSelect.setId(entity.getId());
+                            baseSelect.setValue(entity.getUnitName());
+                            return baseSelect;
+                        }
                 )
                 .collect(Collectors.toList());
         return Result.ok().data(vos);

--
Gitblit v1.8.0