From 911fcef96a766bc5689cd5fcb24725a7a65bbd50 Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Mon, 13 Dec 2021 12:01:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=9F=E8=AE=A1=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCaseCommitteeSubitemController.java | 12 ++- .../PayCaseCouncilSubitemController.java | 16 +++- .../mapper/PayCaseCommitteeSubitemMapper.java | 3 +- .../mapper/PayCaseCouncilSubitemMapper.java | 2 +- .../xml/PayCaseCommitteeSubitemMapper.xml | 3 + .../xml/PayCaseCouncilSubitemMapper.xml | 3 + .../IPayCaseCommitteeSubitemService.java | 2 +- .../IPayCaseCouncilSubitemService.java | 2 +- .../PayCaseCommitteeSubitemServiceImpl.java | 4 +- .../PayCaseCouncilSubitemServiceImpl.java | 4 +- .../entity/PayWorkGroupSubletStatistics.java | 10 +- .../AllProjectStatisticsController.java | 96 ++++++++++--------- .../CompanyComeMoneyStatisticsController.java | 4 + .../entity/CompanyComeMoneyDetail.java | 6 +- 14 files changed, 100 insertions(+), 67 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java index 68bb5d9b..f5b994b5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java @@ -14,6 +14,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.common.util.oConvertUtils; import com.jero.data.entity.*; @@ -21,6 +22,7 @@ import com.jero.data.entity.DTO.PayCaseCommitteeSubitemDTO; import com.jero.data.entity.VO.payCaseCommitteeSubitemVO; import com.jero.data.mapper.PayCaseCommitteeSubitemMapper; import com.jero.data.service.IPayCaseCommitteeSubitemService; +import com.jero.mail.commont.constant; import com.jero.meeting.entity.PayMeetingRemindRecord; import com.jero.meeting.service.IPayMeetingRemindRecordService; import com.jero.project.common.PayProjectCommon; @@ -30,6 +32,7 @@ import io.swagger.annotations.ApiImplicitParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeanUtils; @@ -81,8 +84,15 @@ public class PayCaseCommitteeSubitemController extends JeroController roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); + String userName=null; + if (roleCodes.contains(constant.BMFZR)){ + userName=sysUser.getUsername(); + } Page page = new Page<>(pageNo, pageSize); - IPage pageList = payCaseCommitteeSubitemService.listThree(page,contactsNames,companyNames,fenBiaoWeiNames); + IPage pageList = payCaseCommitteeSubitemService.listThree(page,contactsNames,companyNames,fenBiaoWeiNames,userName); if (!CollectionUtils.isEmpty(pageList.getRecords())) { try { pageList.getRecords().forEach(p -> { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java index 029c7524..54ceac0b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java @@ -13,6 +13,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.common.util.oConvertUtils; import com.jero.data.entity.*; @@ -21,9 +22,12 @@ import com.jero.data.service.IPayCaseCouncilSubitemService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.mail.commont.constant; +import com.jero.modules.system.util.SecurityUtil; import com.jero.util.AmountUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeanUtils; @@ -65,9 +69,15 @@ public class PayCaseCouncilSubitemController extends JeroController roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); + String userName=null; + if (roleCodes.contains(constant.BMFZR)){ + userName=sysUser.getUsername(); + } Page page = new Page<>(pageNo, pageSize); - IPage pageList = payCaseCouncilSubitemService.listThree(page,contactsNames,companyNames,councilNames); + IPage pageList = payCaseCouncilSubitemService.listThree(page,contactsNames,companyNames,councilNames,userName); if (!CollectionUtils.isEmpty(pageList.getRecords())) { try { pageList.getRecords().forEach(p -> { @@ -172,7 +182,7 @@ public class PayCaseCouncilSubitemController extends JeroController { - IPage listThree (Page page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName); + IPage listThree (Page page,@Param("name") String name,@Param("companyName") String companyName,@Param("fenBiaoWeiName") String fenBiaoWeiName,@Param("userName") String userName); List listTwo (@Param(Constants.WRAPPER) Wrapper wrapper); - List listForExcel (@Param("name") String name,@Param("companyName") String companyName,@Param("councilName") String councilName); List chooseExcel(ArrayList idList); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java index 712b9c5e..ab4fd9a5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java @@ -20,7 +20,7 @@ import java.util.List; */ public interface PayCaseCouncilSubitemMapper extends BaseMapper { - IPage listThree(Page page, @Param("contactsNames")String contactsNames, @Param("companyNames") String companyNames, @Param("councilNames") String councilNames); + IPage listThree(Page page, @Param("contactsNames")String contactsNames, @Param("companyNames") String companyNames, @Param("councilNames") String councilNames,@Param("userName") String userName); List chooseExcel(@Param("idList")ArrayList idList); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml index bc131e2f..7dbedfbc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml @@ -30,6 +30,9 @@ AND pe.name LIKE CONCAT('%',#{fenBiaoWeiName},'%') + + AND pe.create_by = #{userName} + group by pe.id order by pe.create_time desc diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml index ca4ecfed..2b0c4472 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml @@ -30,6 +30,9 @@ AND pe.name LIKE CONCAT('%',#{councilNames},'%') + + AND pe.create_by = #{userName} + group by pe.id order by pe.create_time desc diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java index 0e385ff2..d5386709 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeSubitemService.java @@ -25,7 +25,7 @@ public interface IPayCaseCommitteeSubitemService extends IService listTwo(QueryWrapper queryWrapper); - IPage listThree(Page page,String name,String companyName,String fenBiaoWeiName); + IPage listThree(Page page,String name,String companyName,String fenBiaoWeiName,String userName); List listForExcel(String name, String companyName, String councilName); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java index 7e7b8fc9..8da94f32 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java @@ -19,7 +19,7 @@ import java.util.List; */ public interface IPayCaseCouncilSubitemService extends IService { - IPage listThree(Page page,String contactsNames, String companyNames, String councilNames); + IPage listThree(Page page,String contactsNames, String companyNames, String councilNames, String userName); List listForExcel(String contactsNames, String companyNames, String councilNames); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java index b313e6eb..35f84b86 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeSubitemServiceImpl.java @@ -41,8 +41,8 @@ public class PayCaseCommitteeSubitemServiceImpl extends ServiceImpl listThree(Page page,String name,String companyName,String fenBiaoWeiName) { - return payCaseCommitteeSubitemMapper.listThree(page,name,companyName,fenBiaoWeiName); + public IPage listThree(Page page,String name,String companyName,String fenBiaoWeiName,String userName) { + return payCaseCommitteeSubitemMapper.listThree(page,name,companyName,fenBiaoWeiName,userName); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java index 90c46ed8..f463d547 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java @@ -28,8 +28,8 @@ public class PayCaseCouncilSubitemServiceImpl extends ServiceImpl listThree(Page page, String contactsNames, String companyNames, String councilNames) { - return payCaseCouncilSubitemMapper.listThree(page,contactsNames,companyNames,councilNames); + public IPage listThree(Page page, String contactsNames, String companyNames, String councilNames, String userName) { + return payCaseCouncilSubitemMapper.listThree(page,contactsNames,companyNames,councilNames,userName); } @Override diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java index 098b10db..6fa8078f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java @@ -20,6 +20,12 @@ public class PayWorkGroupSubletStatistics { @ApiModelProperty(value = "来款单位") private String chargeCompanyTemporaryName; + @ApiModelProperty(value = "打包") + private Integer pack; + + @Excel(name = "打包", width = 15) + private String packText; + @Excel(name = "应收总金额", width = 15) @ApiModelProperty(value = "应收总金额") private String allMoney; @@ -38,11 +44,7 @@ public class PayWorkGroupSubletStatistics { @ApiModelProperty(value = "来款用途文本") private String chargeUse_text; - @ApiModelProperty(value = "打包") - private Integer pack; - @Excel(name = "打包", width = 15) - private String packText; @Excel(name = "项目负责人", width = 15) @ApiModelProperty(value = "项目负责人") 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 832da690..63e5e107 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 @@ -64,6 +64,8 @@ import java.util.stream.Collectors; @RequestMapping("/statistics/allProjectStatistics") @Slf4j public class AllProjectStatisticsController { + @Resource + private SysUserMapper userMapper; @Autowired private ISysDepartService sysDepartService; @Autowired @@ -164,29 +166,29 @@ public class AllProjectStatisticsController { allProjectStatisticsSearch.setProjectName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName())); 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(","))); -// -// //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(); -// } + 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.queryPageListForProject(page,allProjectStatisticsSearch,null); HashMap hashMap = new HashMap<>(); @@ -334,30 +336,30 @@ public class AllProjectStatisticsController { allProjectStatisticsSearch.setProjectName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName())); 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(","))); -// -// //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, AllProjectStatistics.class, "项目来款统计"); -// } + 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, AllProjectStatistics.class, "项目来款统计"); + } List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, null); if (pageList != null) { 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 5d3475cd..5a8bbcf7 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 @@ -270,6 +270,10 @@ public class CompanyComeMoneyStatisticsController { // return AmountUtil.exportListXls(objects, CompanyComeMoneyDetail.class, "企业来款详情统计"); // } List pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, null); + PayCompanyManagement byId = payCompanyManagementService.getById(companyComeMoneyDetailSearch.getChargeCompanyId()); + for(CompanyComeMoneyDetail s:pageList){ + s.setChargeCompanyName(byId.getCompanyName()); + } for (CompanyComeMoneyDetail s : pageList) { String key = String.valueOf(s.getChargeUse()); String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java index a69c3573..275ec13a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java @@ -13,12 +13,12 @@ import org.jeecgframework.poi.excel.annotation.Excel; public class CompanyComeMoneyDetail { @ApiModelProperty(value = "项目id") private String projectId; - @Excel(name = "来款企业", width = 15) - @ApiModelProperty(value = "来款企业") - private String chargeCompanyName; @Excel(name = "来款项目", width = 15) @ApiModelProperty(value = "来款项目") private String projectName; + @Excel(name = "来款企业", width = 15) + @ApiModelProperty(value = "来款企业") + private String chargeCompanyName; @Excel(name = "应收总金额", width = 15) @ApiModelProperty(value = "应收金额") private String allMoney;