diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java index f8eccab0..adab6256 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupMapper.java @@ -189,7 +189,7 @@ public interface PayWorkingGroupMapper extends BaseMapper { List queryPageListForPrincipalDetailTwo(@Param("principalPeopleDetailSearch") PrincipalPeopleDetailSearch principalPeopleDetailSearch,@Param("ids") ArrayList ids); - AllMoney queryPageList33(@Param("allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch); + AllMoney queryPageList33(@Param("allProjectStatisticsSearch") AllProjectStatisticsSearch allProjectStatisticsSearch, @Param("idList") List idList); AllMoney queryPageListForCompany33(@Param("companyComeMoneySearch") CompanyComeMoneySearch companyComeMoneySearch, @Param("idList") List idList); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index ee526200..078097bd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -781,7 +781,12 @@ FROM pay_working_group pwg right join pay_working_group_subitem pwgs on(pwg.id=pwgs.working_group_id) left JOIN sys_user su on(pwg.principal_id_a=su.id) left join sys_depart sd on(su.org_code=sd.org_code) - + + pwg.principal_id_a in + + #{item} + + AND pwg.working_group_project LIKE concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) @@ -840,7 +845,12 @@ FROM pay_common_project pcp left JOIN sys_user su on(pcp.principal_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) - + + pcp.principal_id in + + #{item} + + AND pcp.charge_project LIKE concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) @@ -900,7 +910,12 @@ FROM pay_member_project pmp right join pay_member_project_subitem pmps on(pmp.id=pmps.project_id) left JOIN sys_user su on(pmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) - + + pmp.director_id in + + #{item} + + AND pmp.project_name LIKE concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) @@ -959,7 +974,12 @@ FROM pay_meeting pm right join pay_meeting_situation pms on(pm.id=pms.meeting_id) left JOIN sys_user su on(pm.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) - + + pm.director_id in + + #{item} + + AND pm.meeting_name LIKE concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) @@ -1018,7 +1038,12 @@ FROM tb_member_project tmp left join tb_member_project_subitem tmps on(tmp.id=tmps.project_id) left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) - + + tmp.director_id in + + #{item} + + AND tmp.project_name LIKE concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) @@ -1077,7 +1102,12 @@ FROM tb_member_project tmp left join tb_certificate_payment tcp on(tmp.id=tcp.project_id) left JOIN sys_user su on(tmp.director_id=su.id) left join sys_depart sd on(su.org_code=sd.org_code) - + + tmp.director_id in + + #{item} + + AND tmp.project_name LIKE concat('%',concat(#{allProjectStatisticsSearch.projectName},'%')) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java index df541ce0..80583204 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupService.java @@ -220,7 +220,7 @@ public interface IPayWorkingGroupService extends IService { */ IPage queryPageListForProject(Page page, AllProjectStatisticsSearch allProjectStatisticsSearch, List idList); - AllMoney queryPageList33(AllProjectStatisticsSearch allProjectStatisticsSearch); + AllMoney queryPageList33(AllProjectStatisticsSearch allProjectStatisticsSearch, List idList); AllMoney queryPageListForCompany33(CompanyComeMoneySearch companyComeMoneySearch, List idList); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java index 3e4af29f..90dda474 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java @@ -565,8 +565,8 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl idList) { + return payWorkingGroupMapper.queryPageList33(allProjectStatisticsSearch, idList); } @Override diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java index 4342adc6..7ac2e212 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java @@ -121,7 +121,7 @@ public class AllProjectStatisticsController { } } - AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch); + AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch,null); hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getAllMoney()); hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getComeAllMoney()); @@ -148,7 +148,7 @@ public class AllProjectStatisticsController { allProjectStatisticsSearch.setChargeCompanyTemporaryName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName())); //根据不同角色加载不同列表的参数 List idList = new ArrayList<>(); - //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码 + //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); String roleCode = sysUser.getRoleCode(); List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); @@ -164,13 +164,10 @@ public class AllProjectStatisticsController { idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); idList.addAll(allDepartIds);//项目负责人 - } else if (roleCodes.contains(constant.XMFZR)) { - String userId = sysUser.getId(); - idList.add(userId); } else { return Result.OK(); } - Page page = new Page<>(pageNo, pageSize); + Page page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList); HashMap hashMap = new HashMap<>(); // double sum=0; @@ -197,7 +194,7 @@ public class AllProjectStatisticsController { } } - AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch); + AllMoney allMoney = payWorkingGroupService.queryPageList33(allProjectStatisticsSearch,idList); hashMap.put("sumOfMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getAllMoney()); hashMap.put("sumOfReallyMoney",ObjectUtils.isEmpty(allMoney)?0:allMoney.getComeAllMoney()); @@ -351,15 +348,12 @@ public class AllProjectStatisticsController { idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); idList.addAll(allDepartIds); - } else if (roleCodes.contains(constant.XMFZR)) { - String userId = sysUser.getId(); - idList.add(userId); } else { ArrayList objects = new ArrayList<>(); return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "项目来款统计"); } - List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, null); + List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList); if (pageList != null) { for (AllProjectStatistics s : pageList) { String key = String.valueOf(s.getChargeUse());