From 1cad14bca191807e18705c3a5526eda8151be439 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 14 四月 2025 23:10:22 +0800
Subject: [PATCH] 批量审核和图片保存bug
---
ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
index b5b2e3b..f604e58 100644
--- a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
@@ -3,12 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.dto.UmsDepartDto;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
import com.ycl.mapper.depart.UmsDepartMapper;
-import com.ycl.mapper.dict.DataDictionaryMapper;
import com.ycl.service.depart.IDepartManagerService;
import com.ycl.service.depart.UmsDepartService;
import com.ycl.service.user.UmsAdminService;
@@ -23,6 +23,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -45,8 +46,6 @@
IDepartManagerService iDepartManagerService;
@Resource
UmsDepartService umsDepartService;
- @Resource
- DataDictionaryMapper dataDictionaryMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -113,9 +112,9 @@
// 2.缁勮鎴愮埗瀛愮殑鏍戝瀷缁撴瀯
// 2.1銆佹壘鍒版墍鏈夌殑涓�绾х綉鏍�:浣跨敤jdk8鐨剆tream娴佽繘琛岃繃婊�
- List<UmsDepart> collect = list.stream().filter(griddingEntity ->
+ List<UmsDepart> collect = list.stream().filter(item ->
//鍒嗙被鐖秈d涓�0灏辫〃绀鸿缃戞牸涓� 涓�绾х綉鏍�
- griddingEntity.getParentId() == 0&&griddingEntity.getStatus()==1
+ item.getParentId() == 0
).map(item -> {
// 鎵惧埌瀛愮綉鏍� set杩沜hildren灞炴�т腑
item.setChildren(getChildrens(item, list));
@@ -139,6 +138,29 @@
}
@Override
+ public List<UmsDepartDto> departExp() {
+ List<UmsDepart> umsDeparts = sccgDepartMapper.selectDepartList();
+ List<UmsDepartDto> res = umsDeparts
+ .stream()
+ .map(item -> {
+ UmsDepartDto umsDepartDto = new UmsDepartDto();
+ umsDepartDto.setId(item.getId());
+ umsDepartDto.setDepartTypeName(item.getDepartName());
+ String departType = sccgDepartMapper.getDepartType(item.getDepartType());
+ umsDepartDto.setDepartType(departType);
+ UmsDepart umsDepartFather = sccgDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>().eq(UmsDepart::getId, item.getParentId()));
+ if (Objects.isNull(umsDepartFather)){
+ umsDepartDto.setParentDepartName("");
+ }else {
+ umsDepartDto.setParentDepartName(umsDepartFather.getDepartName());
+ }
+ umsDepartDto.setDepartDes(item.getDepartDes());
+ return umsDepartDto;
+ }).collect(Collectors.toList());
+ return res;
+ }
+
+ @Override
public void updateStatus(DepartVO.StatusDepartVO params) {
UmsDepart sccgDepart = this.loadDepartById(params.getId());
BeanUtils.copyProperties(params, sccgDepart);
--
Gitblit v1.8.0