LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 科室统计和个人来款统计时，查询所在部门sql错误

Browse Source
This commit is contained in:
lijiarao
2024-06-27 17:51:25 +08:00
parent a159499235
commit 0aa6308b8b
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+3 -2
View File
@@ -1,5 +1,6 @@
package com.jero.statistics.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -131,7 +132,7 @@ public class AllProjectStatisticsController {
//获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
List<String> allDepartIds = sysBaseAPI.getAllUserIdsByDepart(sysUser.getDepartIds(), idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
idList.addAll((userMapper.selectList(new LambdaQueryWrapper<SysUser>().eq(SysUser::getStatus, 1).eq(SysUser::getDelFlag, 0).eq(SysUser::getDepartIds, sysUser.getDepartIds()))).stream().map(SysUser::getId).collect(Collectors.toList()));
idList.addAll(allDepartIds);//项目负责人
} else {
@@ -231,7 +232,7 @@ public class AllProjectStatisticsController {
//获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
List<String> allDepartIds = sysBaseAPI.getAllUserIdsByDepart(sysUser.getDepartIds(), idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
idList.addAll((userMapper.selectList(new LambdaQueryWrapper<SysUser>().eq(SysUser::getStatus, 1).eq(SysUser::getDelFlag, 0).eq(SysUser::getDepartIds, sysUser.getDepartIds()))).stream().map(SysUser::getId).collect(Collectors.toList()));
idList.addAll(allDepartIds);
} else {
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+3 -2
View File
@@ -1,5 +1,6 @@
package com.jero.statistics.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -80,7 +81,7 @@ public class PrincipalPeopleStatisticsController {
//获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
List<String> allDepartIds = sysBaseAPI.getAllUserIdsByDepart(sysUser.getDepartIds(), idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
idList.addAll((userMapper.selectList(new LambdaQueryWrapper<SysUser>().eq(SysUser::getStatus, 1).eq(SysUser::getDelFlag, 0).eq(SysUser::getDepartIds, sysUser.getDepartIds()))).stream().map(SysUser::getId).collect(Collectors.toList()));
idList.addAll(allDepartIds);
//项目负责人
@@ -185,7 +186,7 @@ public class PrincipalPeopleStatisticsController {
//获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员)
List<String> allDepartIds = sysBaseAPI.getAllUserIdsByDepart(sysUser.getDepartIds(), idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
idList.addAll((userMapper.selectList(new LambdaQueryWrapper<SysUser>().eq(SysUser::getStatus, 1).eq(SysUser::getDelFlag, 0).eq(SysUser::getDepartIds, sysUser.getDepartIds()))).stream().map(SysUser::getId).collect(Collectors.toList()));
idList.addAll(allDepartIds);
//项目负责人
jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java
+1 -1
View File
@@ -1121,7 +1121,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
List<SysDepartTreeModel> sysDepartTreeModels =listSonDepartsByDepId(departId);
if(!(sysDepartTreeModels.size()==0)) {
for (SysDepartTreeModel s : sysDepartTreeModels) {
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", s.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
idList.addAll((userMapper.selectList(new LambdaQueryWrapper<SysUser>().eq(SysUser::getStatus, 1).eq(SysUser::getDelFlag, 0).eq(SysUser::getDepartIds, s.getId()))).stream().map(SysUser::getId).collect(Collectors.toList()));
getAllUserIdsByDepart(s.getId(),idList);
}
return idList;