From c219f11b51903d5aeb4c7ca261df593597aa7fe2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 16 四月 2024 17:59:54 +0800
Subject: [PATCH] 人员明细+报告编制的提交审核批准+能力范围的下拉数据字典
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java
index 62c43c3..56e1c6d 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DepartmentServiceImpl.java
@@ -2,11 +2,18 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.DepartmentDto;
+import com.yuanchu.mom.dto.UserDto;
+import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.Department;
import com.yuanchu.mom.mapper.DepartmentMapper;
+import com.yuanchu.mom.pojo.Device;
+import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.DepartmentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import lombok.var;
import org.springframework.stereotype.Service;
@@ -20,6 +27,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -77,16 +85,30 @@
return removeBatchByIds(department);
}
+ //鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�
+ @Override
+ public Map<String, Object> showUserById(Page page, UserDto user) {
+ //鏍规嵁閮ㄩ棬id,鏌ヨ浠栫殑鎵�鏈夊瓙绫籭d
+ List<Integer> list = departmentMapper.selectSonById(Integer.parseInt(user.getDepartId()));
+ String ids = list.stream()
+ .map(Object::toString)
+ .collect(Collectors.joining(","));
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(UserDto.class));
+ map.put("body", departmentMapper.showUserById(page, ids, QueryWrappers.queryWrappers(user)));
+ return map;
+ }
+
//鍒ゆ柇鏄惁鏈夊瓙绫�,鐩村埌娌℃湁涓烘
- public List<Department> getDepartment(Integer id){
+ public List<Department> getDepartment(Integer id) {
List<Department> list = new ArrayList<>();
Department depart = baseMapper.selectById(id);
list.add(depart);
List<Department> departments = baseMapper.selectList(Wrappers.<Department>lambdaQuery().eq(Department::getFatherId, id));
- if (ObjectUtils.isNotEmpty(departments)){
+ if (ObjectUtils.isNotEmpty(departments)) {
list.addAll(departments);
- for (Department department : departments){
+ for (Department department : departments) {
list.addAll(getDepartment(department.getId()));
}
}
--
Gitblit v1.9.3