From c0f3e4bb04c5f87a33d0d5de109120e956128545 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 12 三月 2024 18:33:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index 1941582..adaec69 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -1,17 +1,25 @@
package com.ycl.platform.service.impl;
import com.ycl.platform.domain.entity.YwPoint;
+import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.mapper.YwPointMapper;
+import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.YwPointService;
+import com.ycl.platform.service.YwUnitService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.form.YwPointForm;
import com.ycl.platform.domain.vo.YwPointVO;
import com.ycl.platform.domain.query.YwPointQuery;
import java.util.List;
+
+import com.ycl.system.entity.SysDept;
+import com.ycl.system.service.ISysDeptService;
import org.apache.commons.lang3.StringUtils;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.beans.BeanUtils;
@@ -22,6 +30,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
+import org.springframework.util.StringUtils;
/**
* 杩愮淮鐐逛綅 鏈嶅姟瀹炵幇绫�
@@ -34,6 +43,11 @@
public class YwPointServiceImpl extends ServiceImpl<YwPointMapper, YwPoint> implements YwPointService {
private final YwPointMapper ywPointMapper;
+ @Autowired
+ private ISysDeptService deptService;
+ @Autowired
+ private YwUnitService unitService;
+ private final YwUnitMapper ywUnitMapper;
/**
* 娣诲姞
@@ -115,14 +129,18 @@
public Result page(YwPointQuery query) {
IPage<YwPoint> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .like(StringUtils.hasText(query.getPointName()), YwPoint::getPointName, query.getPointName())
.orderByDesc(YwPoint::getCreateTime)
.page(PageUtil.getPage(query, YwPoint.class));
List<YwPointVO> vos = page.getRecords().stream()
.map(
entity -> YwPointVO.getVoByEntity(entity, null)
+ .setDeptName(deptService.selectDeptById(entity.getDeptId()).getDeptName())
+ .setUnitName(unitService.getById(entity.getUnitId()).getUnitName())
)
.collect(Collectors.toList());
+
return Result.ok().data(vos).total(page.getTotal());
}
--
Gitblit v1.8.0