From 1b8c7546e51361930636dd8280c103ffe22a3793 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Thu, 28 Oct 2021 09:59:42 +0800 Subject: [PATCH] =?UTF-8?q?fixbug=EF=BC=9A=E4=BC=81=E4=B8=9A=E7=AB=AF?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=92=8C=E8=B4=A2=E5=8A=A1=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/controller/PayCaseCommitteeController.java | 2 +- ...PayWorkingGroupDistributionRecordController.java | 2 +- .../controller/AllProjectStatisticsController.java | 13 ++++++++----- .../CompanyComeMoneyStatisticsController.java | 10 ++++++---- .../PayWorkingGroupStatisticsController.java | 9 ++++++--- .../PrincipalPeopleStatisticsController.java | 6 ++++-- 6 files changed, 26 insertions(+), 16 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java index 23cae957..45d50dc8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java @@ -132,7 +132,7 @@ public class PayCaseCommitteeController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupService.queryPageList(page,allProjectStatisticsSearch, idList ); @@ -167,7 +167,7 @@ public class AllProjectStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + return Result.OK(); } Page page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList); @@ -236,7 +236,8 @@ public class AllProjectStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计"); } if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { Calendar calendar = Calendar.getInstance(); @@ -275,7 +276,8 @@ public class AllProjectStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计"); } if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { @@ -325,7 +327,8 @@ public class AllProjectStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "企业来款统计"); } List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList); 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 9904ef68..c3b29bc8 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 @@ -84,7 +84,7 @@ public class CompanyComeMoneyStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + return Result.OK(); } Page page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,idList); @@ -148,7 +148,7 @@ public class CompanyComeMoneyStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + return Result.OK(); } Page page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList); @@ -210,7 +210,8 @@ public class CompanyComeMoneyStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, CompanyComeMoneyList.class, "企业来款统计"); } List pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, idList); @@ -244,7 +245,8 @@ public class CompanyComeMoneyStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, CompanyComeMoneyDetail.class, "企业来款详情统计"); } List pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, idList); for (CompanyComeMoneyDetail s : pageList) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java index 64e1005b..e3e33877 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java @@ -22,6 +22,7 @@ import com.jero.project.entity.PayWorkingGroupStatistics; import com.jero.project.entity.PayWorkingGroupSubletSearch; import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.service.IPayWorkingGroupSubItemService; +import com.jero.statistics.entity.CompanyComeMoneyDetail; import com.jero.util.AmountUtil; import com.jero.util.SearchUtil; import io.swagger.annotations.Api; @@ -95,7 +96,7 @@ public class PayWorkingGroupStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + return Result.OK(); } IPage pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch,idList); List records = pageList.getRecords(); @@ -161,7 +162,8 @@ public class PayWorkingGroupStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计"); } List pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList); //处理为空数据为0 @@ -198,7 +200,8 @@ public class PayWorkingGroupStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计"); } List pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList,strings); //处理为空数据为0 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java index 0a13ef5a..6fad3094 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java @@ -18,6 +18,7 @@ import com.jero.mail.entity.PayMailBillProject; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.project.entity.PayWorkGroupSubletStatistics; +import com.jero.project.entity.PayWorkingGroupStatistics; import com.jero.project.service.IPayWorkingGroupService; import com.jero.statistics.entity.*; import com.jero.util.AmountUtil; @@ -92,7 +93,7 @@ public class PrincipalPeopleStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + return Result.OK(); } Page page = new Page<>(pageNo, pageSize); @@ -205,7 +206,8 @@ public class PrincipalPeopleStatisticsController { String userId = sysUser.getId(); idList.add(userId); } else { - throw new JeroBootException("权限异常"); + ArrayList objects = new ArrayList<>(); + return AmountUtil.exportListXls(objects, PrincipalPeopleList.class, "个人来款"); } List pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch, idList);