From 40d1cad64d2de02d3d93beab89058287b9a355ea Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 05 三月 2024 15:38:26 +0800
Subject: [PATCH] 运维人员优化
---
ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPeopleQuery.java | 16 ++++++++
ycl-server/src/main/java/com/ycl/platform/service/impl/YwUnitServiceImpl.java | 13 +++++-
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPeopleVO.java | 1
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPeopleServiceImpl.java | 21 ++++++++++
ycl-pojo/src/main/java/com/ycl/platform/base/BaseSelect.java | 22 +++++++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPeopleForm.java | 1
6 files changed, 70 insertions(+), 4 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/base/BaseSelect.java b/ycl-pojo/src/main/java/com/ycl/platform/base/BaseSelect.java
new file mode 100644
index 0000000..94c3200
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/base/BaseSelect.java
@@ -0,0 +1,22 @@
+package com.ycl.platform.base;
+
+import lombok.Data;
+
+/**
+ * @author锛歺p
+ * @date锛�2024/3/5 15:11
+ */
+@Data
+public class BaseSelect {
+
+ /**
+ * 涓婚敭
+ */
+ private Integer id;
+
+ /**
+ * 鍊�
+ */
+ private String value;
+
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPeopleForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPeopleForm.java
index 29525e5..6c3578f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPeopleForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPeopleForm.java
@@ -40,7 +40,6 @@
@ApiModelProperty("鎵�灞炶繍缁村崟浣�")
private Integer belongUnit;
- @NotBlank(message = "娣诲姞鏁版嵁鐨勬柟寮忥細鎵嬪姩銆佸鍏ヤ笉鑳戒负绌�", groups = {Add.class, Update.class})
@ApiModelProperty("娣诲姞鏁版嵁鐨勬柟寮忥細鎵嬪姩銆佸鍏�")
private String addWay;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPeopleQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPeopleQuery.java
index 0040873..98063c5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPeopleQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/YwPeopleQuery.java
@@ -15,5 +15,21 @@
@Accessors(chain = true)
@ApiModel(value = "YwPeople鏌ヨ", description = "杩愮淮浜哄憳鏌ヨ")
public class YwPeopleQuery extends AbsQuery {
+
+ /**
+ * 杩愮淮浜哄憳缂栫爜
+ */
+ private String ywPersonCode;
+
+ /**
+ * 杩愮淮浜哄憳濮撳悕
+ */
+ private String ywPersonName;
+
+ /**
+ * 鎵�灞炶繍缁村崟浣�
+ */
+ private Integer belongUnit;
+
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPeopleVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPeopleVO.java
index 0d7a735..e58ddcd 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPeopleVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPeopleVO.java
@@ -28,6 +28,7 @@
/** 鎵�灞炶繍缁村崟浣� */
private Integer belongUnit;
+ private String belongUnitName;
/** 娣诲姞鏁版嵁鐨勬柟寮忥細鎵嬪姩銆佸鍏� */
private String addWay;
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());
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 89b1ced..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;
@@ -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