From 40d1cad64d2de02d3d93beab89058287b9a355ea Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 05 三月 2024 15:38:26 +0800
Subject: [PATCH] 运维人员优化
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
index 576185f..485bc30 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java
@@ -1,7 +1,9 @@
package com.ycl.platform.service.impl;
import com.ycl.platform.domain.entity.YwPeople;
+import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.mapper.YwPeopleMapper;
+import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.YwPeopleService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,10 +18,12 @@
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;
/**
* 杩愮淮浜哄憳 鏈嶅姟瀹炵幇绫�
@@ -32,6 +36,7 @@
public class YwPeopleServiceImpl extends ServiceImpl<YwPeopleMapper, YwPeople> implements YwPeopleService {
private final YwPeopleMapper ywPeopleMapper;
+ private final YwUnitMapper ywUnitMapper;
/**
* 娣诲姞
@@ -41,6 +46,7 @@
@Override
public Result add(YwPeopleForm form) {
YwPeople entity = YwPeopleForm.getEntityByForm(form, null);
+ entity.setAddWay("manual");
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -101,12 +107,25 @@
public Result page(YwPeopleQuery query) {
IPage<YwPeople> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(StringUtils.hasText(query.getYwPersonCode()), YwPeople::getYwPersonCode, query.getYwPersonCode())
+ .like(StringUtils.hasText(query.getYwPersonName()), YwPeople::getYwPersonName, query.getYwPersonName())
+ .eq(Objects.nonNull(query.getBelongUnit()), YwPeople::getBelongUnit, query.getBelongUnit())
.orderByDesc(YwPeople::getCreateTime)
.page(PageUtil.getPage(query, YwPeople.class));
List<YwPeopleVO> vos = page.getRecords().stream()
.map(
- entity -> YwPeopleVO.getVoByEntity(entity, null)
+ entity -> {
+ YwPeopleVO vo = YwPeopleVO.getVoByEntity(entity, null);
+ YwUnit unit = new LambdaQueryChainWrapper<>(ywUnitMapper)
+ .eq(YwUnit::getId, vo.getBelongUnit())
+ .select(YwUnit::getUnitName)
+ .one();
+ if (Objects.nonNull(unit)) {
+ vo.setBelongUnitName(unit.getUnitName());
+ }
+ return vo;
+ }
)
.collect(Collectors.toList());
return Result.ok().data(vos).total(page.getTotal());
--
Gitblit v1.8.0