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 a47776c4..5638a441 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 @@ -1190,635 +1190,96 @@ + - select pp.projectId,pp.projectName,pp.allMoney,pp.comeAllMoney,pp.chargeUse,if(pp.pack=0,'否','是') as packText,pp.pack from (SELECT - pwgs.create_time as createTime, - pwgs.id AS projectId, - pwg.working_group_project as projectName, - pwgs.receivable_amount AS allMoney, - pwgs.paid_amount AS comeAllMoney, - pwgs.charge_use as chargeUse, - pwgs.pack - FROM pay_working_group_subitem pwgs - left join pay_working_group pwg on (pwgs.working_group_id=pwg.id) + select projectId,projectName,allMoney,comeAllMoney,chargeUse,packText,pack + from + v_statistical - pwgs.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId} + chargeCompanyId = #{CompanyComeMoneyDetailSearch.chargeCompanyId} - and pwg.principal_id_a in - - #{item} - - - - AND pwg.year LIKE - concat(#{CompanyComeMoneyDetailSearch.year},'%') - - - AND pwg.working_group_project LIKE - concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) - - - AND pwgs.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse} - - - AND pwgs.in_account=#{CompanyComeMoneyDetailSearch.inAccountStatue} - - - - AND pwgs.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney} and - pwgs.receivable_amount = #{CompanyComeMoneyDetailSearch.allMoneyTwo} - - - - AND pwgs.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney} - - - AND pwgs.receivable_amount = #{CompanyComeMoneyDetailSearch.allMoneyTwo} - - - - - union ALL - SELECT - pcp.create_time as createTime, - pcp.id AS projectId, - pcp.charge_project as projectName, - pcp.receivable_amount AS allMoney, - pcp.paid_amount AS comeAllMoney, - pcp.charge_use as chargeUse, - pcp.pack - FROM pay_common_project pcp - - pcp.charge_company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId} - - and PCP.principal_id in - - #{item} - - - - AND pcp.year LIKE - concat(#{CompanyComeMoneyDetailSearch.year},'%') - - - AND pcp.charge_project LIKE - concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) - - - AND pcp.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse} - - - AND pcp.in_account=#{CompanyComeMoneyDetailSearch.inAccountStatue} - - - - AND pcp.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney} and pcp.receivable_amount = - #{CompanyComeMoneyDetailSearch.allMoneyTwo} - - - - AND pcp.receivable_amount >= #{CompanyComeMoneyDetailSearch.allMoney} - - - AND pcp.receivable_amount = #{CompanyComeMoneyDetailSearch.allMoneyTwo} - - - - - union ALL - SELECT - pms.create_time as createTime, - pms.id AS projectId, - pm.meeting_name as projectName, - pms.amount_receivable AS allMoney, - pms.paid_amount AS comeAllMoney, - pms.charge_use as chargeUse, - pms.pack - FROM pay_meeting pm right join pay_meeting_situation pms on(pm.id=pms.meeting_id) - - pms.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId} - - and pm.director_id in - - #{item} - - - - AND pm.particular_year LIKE - concat(#{CompanyComeMoneyDetailSearch.year},'%') - - - AND pm.meeting_name LIKE - concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) - - - AND pms.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse} - - - AND pms.in_account=#{CompanyComeMoneyDetailSearch.inAccountStatue} - - - - AND pms.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and pms.amount_receivable = - #{CompanyComeMoneyDetailSearch.allMoneyTwo} - - - - AND pms.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} - - - AND pms.amount_receivable = #{CompanyComeMoneyDetailSearch.allMoneyTwo} - - - - - union ALL - SELECT - pmps.create_time as createTime, - pmps.id AS projectId, - pmp.project_name as projectName, - pmps.amount_receivable AS allMoney, - pmps.paid_amount AS comeAllMoney, - pmps.charge_use as chargeUse, - pmps.pack - FROM pay_member_project pmp right join pay_member_project_subitem pmps on(pmp.id=pmps.project_id) - - pmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId} - - and pmp.director_id in - - #{item} - - - - AND pmp.particular_year LIKE - concat(#{CompanyComeMoneyDetailSearch.year},'%') - - - AND pmp.project_name LIKE - concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) - - - AND pmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse} - - - AND pmps.in_account=#{CompanyComeMoneyDetailSearch.inAccountStatue} - - - - AND pmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and pmps.amount_receivable = - #{CompanyComeMoneyDetailSearch.allMoneyTwo} - - - - AND pmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} - - - AND pmps.amount_receivable = #{CompanyComeMoneyDetailSearch.allMoneyTwo} - - - - - union all - SELECT - tmps.create_time as createTime, - tmps.id AS projectId, - tmp.project_name AS projectName, - tmps.amount_receivable as allMoney, - tmps.paid_amount as comeAllMoney, - tmps.charge_use as chargeUse, - tmps.pack - FROM tb_member_project tmp left join tb_member_project_subitem tmps on(tmp.id=tmps.project_id) - - tmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId} - - and tmp.director_id in + and principalNameId in #{item} - AND tmp.project_name LIKE - concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) + AND projectName LIKE + concat('%'#{CompanyComeMoneyDetailSearch.projectName},'%') + + + + AND payStatue =#{CompanyComeMoneyDetailSearch.inAccountStatue} - AND tmp.year LIKE - concat(#{CompanyComeMoneyDetailSearch.year},'%') - - - AND tmps.in_account =#{CompanyComeMoneyDetailSearch.inAccountStatue} + AND year LIKE + concat('%',#{CompanyComeMoneyDetailSearch.year},'%') - AND tmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse} + AND chargeUse=#{CompanyComeMoneyDetailSearch.chargeUse} - AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and tmps.amount_receivable = + AND allMoney >= #{CompanyComeMoneyDetailSearch.allMoney} and allMoney = #{CompanyComeMoneyDetailSearch.allMoneyTwo} - AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} + AND allMoney >= #{CompanyComeMoneyDetailSearch.allMoney} - AND tmps.amount_receivable = #{CompanyComeMoneyDetailSearch.allMoneyTwo} + AND allMoney = #{CompanyComeMoneyDetailSearch.allMoneyTwo} - union all - SELECT - tmps.create_time as createTime, - tmps.id AS projectId, - tmp.project_name AS projectName, - tmps.amount_receivable as allMoney, - tmps.paid_amount as comeAllMoney, - tmps.charge_use as chargeUse, - tmps.pack - FROM tb_member_project tmp left join tb_certificate_payment tmps on(tmp.id=tmps.project_id) - - tmps.company_id = #{CompanyComeMoneyDetailSearch.chargeCompanyId} - - and tmp.director_id in - - #{item} - - - - AND tmp.project_name LIKE - concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) - - - - AND tmps.in_account =#{CompanyComeMoneyDetailSearch.inAccountStatue} - - - AND tmp.year LIKE - concat(#{CompanyComeMoneyDetailSearch.year},'%') - - - - AND tmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse} - - - - - AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} and tmps.amount_receivable = - #{CompanyComeMoneyDetailSearch.allMoneyTwo} - - - - AND tmps.amount_receivable >= #{CompanyComeMoneyDetailSearch.allMoney} - - - AND tmps.amount_receivable = #{CompanyComeMoneyDetailSearch.allMoneyTwo} - - - - - ) pp where pp.allMoney is not null and pp.allMoney !=0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index faafbbfc..80a47521 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -67,129 +67,108 @@ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index 1966b072..9fe5bdf2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -59,39 +59,9 @@ public class CompanyComeMoneyStatisticsController { public Result list(CompanyComeMoneySearch companyComeMoneySearch, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { - //根据不同角色加载不同列表的参数 -// List idList = new ArrayList<>(); -// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 -// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); -// String roleCode = sysUser.getRoleCode(); -// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); -// //admin -// if (roleCodes.contains(constant.ADMIN)) { -// idList = null; -// //部门负责人 -// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { -// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) -// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); -// //获取本部门成员 -// 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); IPage pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,null); HashMap hashMap = new HashMap<>(); -// double sum=0; -// double sumTwo =0; -// if(ObjectUtils.isNotEmpty(pageList.getRecords())) { -// sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0; -// sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0; -// } //处理为空数据为0 for(CompanyComeMoneyList s: pageList.getRecords()){ if(s.getAllMoney()== null || s.getAllMoney().equals("") ){ @@ -130,30 +100,6 @@ public class CompanyComeMoneyStatisticsController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { companyComeMoneyDetailSearch.setProjectName( oConvertUtils.replaceAllPercent(companyComeMoneyDetailSearch.getProjectName())); -// //根据不同角色加载不同列表的参数 -// List idList = new ArrayList<>(); -// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 -// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); -// String roleCode = sysUser.getRoleCode(); -// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); -// //admin -// if (roleCodes.contains(constant.ADMIN)) { -// idList = null; -// //部门负责人 -// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { -// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) -// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); -// //获取本部门成员 -// 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(); -// } PayCompanyManagement byId = payCompanyManagementService.getById(companyComeMoneyDetailSearch.getChargeCompanyId()); if(ObjectUtils.isEmpty(byId)){ return Result.error("企业id错误，无对应企业id"); @@ -165,13 +111,6 @@ public class CompanyComeMoneyStatisticsController { s.setChargeCompanyName(byId.getCompanyName()); } HashMap hashMap = new HashMap<>(); -// double sum=0; -// double sumTwo =0; -// if(ObjectUtils.isNotEmpty(pageList.getRecords())) { -// sum = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getAllMoney() == null || t.getAllMoney().equals("") ? "0" : t.getAllMoney())).sum() : 0; -// sumTwo = pageList.getRecords() != null ? pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null || t.getComeAllMoney().equals("") ? "0" : t.getComeAllMoney())).sum() : 0; -// } -// DecimalFormat df = new DecimalFormat("#,##0.00"); for(CompanyComeMoneyDetail s: pageList.getRecords()){ String key = String.valueOf(s.getChargeUse()); String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key); @@ -202,31 +141,6 @@ public class CompanyComeMoneyStatisticsController { @GetMapping(value = "/excel") @ApiOperation(value = "企业来款统计-导出统计", notes = "企业来款统计-导出统计") public ModelAndView excel(CompanyComeMoneySearch companyComeMoneySearch) { - //根据不同角色加载不同列表的参数 -// List idList = new ArrayList<>(); -// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 -// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// String roleCode = sysUser.getRoleCode(); -// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); -// //admin -// if (roleCodes.contains(constant.ADMIN)) { -// idList = null; -// //部门负责人 -// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { -// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) -// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); -// //获取本部门成员 -// 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, CompanyComeMoneyList.class, "企业来款统计"); -// } - List pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, null); //处理为空数据为0 for(CompanyComeMoneyList s: pageList) { @@ -252,30 +166,6 @@ public class CompanyComeMoneyStatisticsController { @GetMapping(value = "/excelDetail") @ApiOperation(value = "企业来款详情统计-导出统计", notes = "企业来款详情统计-导出统计") public ModelAndView excelDetail( CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch) { - //根据不同角色加载不同列表的参数 -// List idList = new ArrayList<>(); -// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 -// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// String roleCode = sysUser.getRoleCode(); -// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); -// //admin -// if (roleCodes.contains(constant.ADMIN)) { -// idList = null; -// //部门负责人 -// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { -// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) -// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); -// //获取本部门成员 -// 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, CompanyComeMoneyDetail.class, "企业来款详情统计"); -// } List pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, null); PayCompanyManagement byId = payCompanyManagementService.getById(companyComeMoneyDetailSearch.getChargeCompanyId()); for(CompanyComeMoneyDetail s:pageList){