From 611ba10fe1678dca8f78ad5c01e1193339a445a4 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 06 三月 2024 14:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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 ac43dd6..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;
@@ -12,12 +15,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;
/**
* 杩愮淮鍗曚綅 鏈嶅姟瀹炵幇绫�
@@ -38,6 +45,7 @@
*/
@Override
public Result add(YwUnitForm form) {
+ // todo 澧炲姞瀵瑰簲璐﹀彿
YwUnit entity = YwUnitForm.getEntityByForm(form, null);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
@@ -52,7 +60,7 @@
*/
@Override
public Result update(YwUnitForm form) {
-
+ // todo 淇敼瀵瑰簲璐﹀彿
YwUnit entity = baseMapper.selectById(form.getId());
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
@@ -97,8 +105,14 @@
*/
@Override
public Result page(YwUnitQuery query) {
-
+ // 鍒嗛〉鏉′欢鏌ヨ浣�
IPage<YwUnit> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(StringUtils.hasText(query.getUnitCode()), YwUnit::getUnitCode, query.getUnitCode())
+ .like(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));
@@ -131,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