From 0a71b2c8ea2e8ca9969111187e66260ce518b7b5 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期日, 09 十月 2022 15:02:45 +0800
Subject: [PATCH] 类型查询 部门添加修改 查询修改
---
ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 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 0d55321..9865d23 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
@@ -7,21 +7,27 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.dto.user.AdminDepartDTO;
import com.ycl.entity.depart.UmsDepart;
+import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.user.UmsDepartManage;
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.UmsDepartManageService;
import com.ycl.service.user.UmsAdminService;
+import com.ycl.service.user.UmsDepartManageService;
import com.ycl.utils.common.PojoUtils;
import com.ycl.vo.depart.DepartVO;
+import com.ycl.vo.depart.UmsDepartVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -41,6 +47,12 @@
private UmsDepartManageService umsAdminDepartService;
@Resource
private UmsAdminService umsAdminService;
+ @Resource
+ IDepartManagerService iDepartManagerService;
+ @Resource
+ UmsDepartService umsDepartService;
+ @Resource
+ DataDictionaryMapper dataDictionaryMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -51,9 +63,13 @@
}
UmsDepart depart = new UmsDepart();
BeanUtils.copyProperties(addDepartVO, depart);
- if (sccgDepartMapper.insert(depart) != 1) {
- throw new ApiException(ResultCode.RECORD_SAVE_FAIL);
- }
+ umsDepartService.save(depart);
+ addDepartVO.getDepartManagerList()
+ .forEach(item -> {
+ item.setCreateTime(LocalDateTime.now());
+ item.setDepartId(depart.getId());
+ });
+ iDepartManagerService.saveBatch(addDepartVO.getDepartManagerList());
}
@Override
@@ -122,7 +138,7 @@
}
@Override
- public IPage<UmsDepart> pageDepart(DepartVO.PageDepartVO params) {
+ public IPage<UmsDepartVO> pageDepart(DepartVO.PageDepartVO params) {
Page<UmsDepart> page = new Page<>(params.getCurrent(), params.getPageSize());
LambdaQueryWrapper<UmsDepart> query = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(params.getDepartName())) {
@@ -133,10 +149,19 @@
}
query.orderByDesc(UmsDepart::getCreateTime);
Page<UmsDepart> departPage = sccgDepartMapper.selectPage(page, query);
- List<UmsDepart> records = departPage.getRecords();
+ Page<UmsDepartVO> umsDepartVOPage = new Page<>();
+ BeanUtils.copyProperties(departPage, umsDepartVOPage);
+ List<UmsDepartVO> umsDepartVOList = new ArrayList<>();
//璐熻矗浜�
- if (CollUtil.isNotEmpty(records)) {
- for (UmsDepart record : records) {
+ if (CollUtil.isNotEmpty(departPage.getRecords())) {
+ for (UmsDepart record : departPage.getRecords()) {
+ UmsDepartVO umsDepartVO = new UmsDepartVO();
+ BeanUtils.copyProperties(record, umsDepartVO);
+ umsDepartVO.setDepartType(dataDictionaryMapper
+ .selectOne(new LambdaQueryWrapper<DataDictionary>()
+ .eq(DataDictionary::getId, record.getDepartType()))
+ .getName());
+ umsDepartVOList.add(umsDepartVO);
List<UmsDepartManage> umsAdminDeparts = umsAdminDepartService.queryByDepartId(record.getId());
if (CollUtil.isNotEmpty(umsAdminDeparts)) {
List<AdminDepartDTO.UserInfoDTO> userInfoDTOS = umsAdminDeparts.stream().map(a -> {
@@ -149,7 +174,8 @@
}
}
}
- return departPage;
+ umsDepartVOPage.setRecords(umsDepartVOList);
+ return umsDepartVOPage;
}
@Override
--
Gitblit v1.8.0