From 10e11331cd81f2369f8b8b8722e42573e433c283 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 20 十月 2022 15:20:43 +0800
Subject: [PATCH] 添加消息状态字段查询。
---
ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java | 80 +++++++++++----------------------------
1 files changed, 23 insertions(+), 57 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 801bdf2..6d18845 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
@@ -63,7 +63,7 @@
}
UmsDepart depart = new UmsDepart();
BeanUtils.copyProperties(addDepartVO, depart);
- depart.setStatus(Short.valueOf("1"));
+ depart.setStatus(Short.valueOf("1"));
umsDepartService.save(depart);
addDepartVO.getDepartManagerList()
.forEach(item -> {
@@ -86,27 +86,21 @@
@Transactional(rollbackFor = Exception.class)
public void update(DepartVO.UpdateDepartVO updateDepartVO) {
UmsDepart sccgDepart = this.queryByName(updateDepartVO.getDepartName());
- if (null != sccgDepart && sccgDepart.getId() != updateDepartVO.getId()) {
+ if (null != sccgDepart && !sccgDepart.getId().equals(updateDepartVO.getId())) {
throw new ApiException(ResultCode.RECORD_ALREADY_EXISTS);
}
- UmsDepart depart = this.getById(updateDepartVO.getId());
+ UmsDepart depart = new UmsDepart();
BeanUtils.copyProperties(updateDepartVO, depart);
- List<Long> userIds = updateDepartVO.getUserIds();
- if (CollUtil.isNotEmpty(userIds)) {
- Long departId = updateDepartVO.getId();
- List<UmsDepartManage> departList = umsAdminDepartService.queryByDepartId(departId);
- if (CollUtil.isNotEmpty(departList)) {
- umsAdminDepartService.deletedByDepartId(departId);
- }
- userIds.forEach(e -> {
- UmsDepartManage adminDepart = new UmsDepartManage();
- adminDepart.setDepartId(departId);
- adminDepart.setUserId(e);
- umsAdminDepartService.save(adminDepart);
- });
- }
- if (sccgDepartMapper.updateById(depart) != 1) {
- throw new ApiException(ResultCode.RECORD_UPDATE_FAIL);
+ umsDepartService.updateById(depart);
+ if (updateDepartVO.getDepartManagerList().size() > 0) {
+ iDepartManagerService.deleteByDepartId(depart.getId());
+
+ updateDepartVO.getDepartManagerList()
+ .forEach(item -> {
+ item.setCreateTime(LocalDateTime.now());
+ item.setDepartId(depart.getId());
+ });
+ iDepartManagerService.saveBatch(updateDepartVO.getDepartManagerList());
}
}
@@ -139,44 +133,16 @@
}
@Override
- 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())) {
- query.like(UmsDepart::getDepartName, params.getDepartName());
- }
- if (PojoUtils.Vo.isUsefulSearchParam(params.getDepartType())) {
- query.like(UmsDepart::getDepartType, params.getDepartType());
- }
- query.orderByDesc(UmsDepart::getCreateTime);
- Page<UmsDepart> departPage = sccgDepartMapper.selectPage(page, query);
- Page<UmsDepartVO> umsDepartVOPage = new Page<>();
- BeanUtils.copyProperties(departPage, umsDepartVOPage);
- List<UmsDepartVO> umsDepartVOList = new ArrayList<>();
- //璐熻矗浜�
- 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 -> {
- AdminDepartDTO.UserInfoDTO userInfoDTO = new AdminDepartDTO.UserInfoDTO();
- userInfoDTO.setUserId(a.getUserId());
-// userInfoDTO.setUsername(umsAdminService.getById(a.getUserId()).getUsername());
- return userInfoDTO;
- }).collect(Collectors.toList());
- record.setUserInfoDTOS(userInfoDTOS);
- }
- }
- }
- umsDepartVOPage.setRecords(umsDepartVOList);
- return umsDepartVOPage;
+ public IPage<UmsDepartVO> pageDepart(String departName, IPage<UmsDepartVO> page) {
+
+ List<UmsDepartVO> ls = sccgDepartMapper.selectPageByName(departName, page.offset(), page.getSize());
+ LambdaQueryWrapper<UmsDepart> queryWrapper = new LambdaQueryWrapper<UmsDepart>()
+ .like(StringUtils.isNotEmpty(departName), UmsDepart::getDepartName, departName);
+ long total = this.count(queryWrapper);
+
+ page.setRecords(ls);
+ page.setTotal(total);
+ return page;
}
@Override
--
Gitblit v1.8.0