From f15e2e7e2947c455ada27a14ac19cd17259db4cb Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Tue, 21 Mar 2023 09:31:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/common/helper/UserInfoHelper.java | 5 +++++ .../pmapi/common/helper/impl/UserInfoHelperImpl.java | 11 +++++++++++ .../manage/DefaultDeclaredProjectManage.java | 12 ++++++++++-- .../mapper/DeclaredStatisticsMapper.java | 3 ++- .../mapper/DeclaredStatisticsMapper.xml | 18 +++++++++++++++++- .../service/IDeclaredStatisticsService.java | 3 ++- .../service/impl/DeclaredStatisticsServiceImpl.java | 16 +++++++++++++--- .../pmapi/workbench/manage/WorkbenchManage.java | 8 +++++++- 8 files changed, 67 insertions(+), 9 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/UserInfoHelper.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/UserInfoHelper.java index a9b9cc7..cad7b59 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/UserInfoHelper.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/UserInfoHelper.java @@ -24,4 +24,9 @@ public interface UserInfoHelper { String getUserName(Long userId); + /** + * 判断该用户是否是区管或者超管 + * @return + */ + boolean isAdmin(Long userId); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/UserInfoHelperImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/UserInfoHelperImpl.java index c4cc856..d0fba73 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/UserInfoHelperImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/helper/impl/UserInfoHelperImpl.java @@ -37,4 +37,15 @@ public class UserInfoHelperImpl implements UserInfoHelper { String realName = userFullInfo.getRealName(); return realName; } + + /** + * 判断此人是否是超管或者区管 + * @param userId + * @return + */ + @Override + public boolean isAdmin(Long userId) { + //测试 先返回true + return Boolean.TRUE; + } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java index 8badd65..5bde097 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java @@ -234,9 +234,17 @@ public class DefaultDeclaredProjectManage { } } - public DeclaredProjectStatisticsPO declaredProjectStatistics(Integer year){ + //根据提交者的单位 + public DeclaredProjectStatisticsPO declaredProjectOrgStatistics(Integer year){ UserInfoDetails userInfo = LoginUserUtil.loginUserDetail(); //查此人建设单位的项目 - return statisticsService.getStatistics(userInfo.getOrganizationCode(),year); + return statisticsService.getOrgStatistics(userInfo.getOrganizationCode(),year); + } + + //根据提交者的区域 他是区管或者超管 + public DeclaredProjectStatisticsPO declaredProjectRegionStatistics(Integer year){ + UserInfoDetails userInfo = LoginUserUtil.loginUserDetail(); + //查此人建设单位的项目 + return statisticsService.getRegionStatistics(userInfo.getRegionCode(),year); } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.java index 8360f6b..4db9f07 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.java @@ -15,6 +15,7 @@ import org.apache.ibatis.annotations.Param; */ public interface DeclaredStatisticsMapper extends BaseMapper { - DeclaredProjectStatisticsPO getStatistics(@Param("orgCode") String orgCode,@Param("year") Integer year); + DeclaredProjectStatisticsPO getOrgStatistics(@Param("orgCode") String orgCode,@Param("year") Integer year); + DeclaredProjectStatisticsPO getRegionStatistics(@Param("regionCode") String regionCode,@Param("year") Integer year); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.xml index 846791f..def00d1 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.xml +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/DeclaredStatisticsMapper.xml @@ -2,7 +2,7 @@ - SELECT count(0) totalNum, count(CASE WHEN p.project_type = 1 THEN 1 end) buildNum, @@ -19,4 +19,20 @@ WHERE build_org_code = #{orgCode} and project_year = #{year} + diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/IDeclaredStatisticsService.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/IDeclaredStatisticsService.java index 107f75f..63396a1 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/IDeclaredStatisticsService.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/IDeclaredStatisticsService.java @@ -12,6 +12,7 @@ import com.ningdatech.pmapi.projectdeclared.model.po.DeclaredProjectStatisticsPO */ public interface IDeclaredStatisticsService { - DeclaredProjectStatisticsPO getStatistics(String orgCode,Integer year); + DeclaredProjectStatisticsPO getOrgStatistics(String organizationCode, Integer year); + DeclaredProjectStatisticsPO getRegionStatistics(String regionCode,Integer year); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/impl/DeclaredStatisticsServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/impl/DeclaredStatisticsServiceImpl.java index 3fbbdd4..6931a7f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/impl/DeclaredStatisticsServiceImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/impl/DeclaredStatisticsServiceImpl.java @@ -21,12 +21,22 @@ public class DeclaredStatisticsServiceImpl implements IDeclaredStatisticsService private final DeclaredStatisticsMapper declaredStatisticsMapper; /** - * 根据userId 去查询 申报项目统计 + * 根据userId 去查询 申报项目统计 根据单位 * @param orgCode * @return */ @Override - public DeclaredProjectStatisticsPO getStatistics(String orgCode,Integer year) { - return declaredStatisticsMapper.getStatistics(orgCode,year); + public DeclaredProjectStatisticsPO getOrgStatistics(String orgCode,Integer year) { + return declaredStatisticsMapper.getOrgStatistics(orgCode,year); + } + + /** + * 根据userId 去查询 申报项目统计 根据区域 + * @param regionCode + * @return + */ + @Override + public DeclaredProjectStatisticsPO getRegionStatistics(String regionCode,Integer year) { + return declaredStatisticsMapper.getRegionStatistics(regionCode,year); } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java index d6d8629..81cde72 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/manage/WorkbenchManage.java @@ -2,6 +2,7 @@ package com.ningdatech.pmapi.workbench.manage; import cn.hutool.core.bean.BeanUtil; import com.ningdatech.basic.model.PageVo; +import com.ningdatech.pmapi.common.helper.UserInfoHelper; import com.ningdatech.pmapi.projectdeclared.manage.DeclaredProjectManage; import com.ningdatech.pmapi.projectdeclared.manage.DefaultDeclaredProjectManage; import com.ningdatech.pmapi.projectdeclared.model.po.DeclaredProjectStatisticsPO; @@ -43,6 +44,8 @@ public class WorkbenchManage { private final NoticeManage noticeManage; + private final UserInfoHelper userInfoHelper; + public WorkbenchVO getWorkbenchData(Integer year){ UserInfoDetails userInfo = LoginUserUtil.loginUserDetail(); WorkbenchVO res = new WorkbenchVO(); @@ -57,7 +60,10 @@ public class WorkbenchManage { res.setTodoCerter(statisticsVO); //2.项目统计数据 - res.setOrgDeclared(WorkbenchConverter.convert(defaultDeclaredProjectManage.declaredProjectStatistics(year))); + res.setOrgDeclared(WorkbenchConverter.convert(defaultDeclaredProjectManage.declaredProjectOrgStatistics(year))); + if(userInfoHelper.isAdmin(userInfo.getUserId())){ + res.setRegionDeclared(WorkbenchConverter.convert(defaultDeclaredProjectManage.declaredProjectRegionStatistics(year))); + } ProjectListReq projectListReq = new ProjectListReq(); projectListReq.setPageNumber(1); projectListReq.setPageSize(5); From c69e36ae993fcf61a651462dc9ea5260584f5312 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Tue, 21 Mar 2023 10:36:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?debug=20=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java index 5bde097..2d0d8bd 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java @@ -90,6 +90,12 @@ public class DefaultDeclaredProjectManage { //判断 年度计划金额 如果开着的话 if(projectInfo.getIsAnnualPlanAmount()){ BigDecimal annualPlanAmount = projectInfo.getAnnualPlanAmount(); + + VUtils.isTrue(annualPlanAmount.compareTo(BigDecimal.ZERO) <= 0) + .throwMessage(String.format("申报失败! 年度支付总金额【{}】 不能小于等于0",annualPlanAmount)); + VUtils.isTrue(annualPlanAmount.compareTo(declareAmount) > 0) + .throwMessage(String.format("申报失败! 年度支付总金额【{}】 不能大于申报金额 【{}】",annualPlanAmount,declareAmount)); + BigDecimal annualGovSuperAmount = projectInfo.getAnnualPlanGovSuperiorFinanceAmount(); BigDecimal annualOwnSuperAmount = projectInfo.getAnnualPlanGovOwnFinanceAmount(); BigDecimal annualBankLendingAmount = projectInfo.getAnnualPlanBankLendingAmount(); From 9aa0598c158c9a7e9911c2bc26fb6a8ce34d61f2 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Tue, 21 Mar 2023 10:39:48 +0800 Subject: [PATCH 3/4] merge --- .../java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index 07d71f0..ff5fd04 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -66,13 +66,11 @@ import com.ningdatech.pmapi.user.entity.UserInfo; import com.ningdatech.pmapi.user.security.auth.model.UserFullInfoDTO; import com.ningdatech.pmapi.user.service.IUserInfoService; import com.ningdatech.pmapi.user.util.LoginUserUtil; -import com.sun.org.apache.bcel.internal.generic.NEW; import com.wflow.contants.HisProInsEndActId; import com.wflow.exception.BusinessException; import com.wflow.workflow.bean.dto.ProcessInstanceUserDto; import com.wflow.workflow.bean.dto.ReqProcessHandlerDTO; import com.wflow.workflow.bean.dto.TodoCenterListReqDTO; -import com.wflow.workflow.bean.dto.TodoCenterListReqDTO; import com.wflow.workflow.bean.process.ProgressNode; import com.wflow.workflow.bean.process.enums.NodeTypeEnum; import com.wflow.workflow.bean.vo.ProcessInstanceVo; From 5b5d5460693717d738d417ecfcb11063c07ce1bc Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Tue, 21 Mar 2023 11:03:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectdeclared/manage/DefaultDeclaredProjectManage.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java index 2d0d8bd..824aa77 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DefaultDeclaredProjectManage.java @@ -85,16 +85,16 @@ public class DefaultDeclaredProjectManage { BigDecimal totalAmount = govSuperFinanceAmount .add(govOwnFinanceAmount).add(bankLendingAmount).add(haveAmount).add(otherAmount); VUtils.isTrue(declareAmount.compareTo(totalAmount) != 0) - .throwMessage(String.format("申报失败! 申报总金额【{}】 不等于其它申报金额 【{}】",declareAmount,totalAmount)); + .throwMessage(String.format("申报失败! 申报总金额【%s】 不等于其它申报金额 【%s】",declareAmount,totalAmount)); //判断 年度计划金额 如果开着的话 if(projectInfo.getIsAnnualPlanAmount()){ BigDecimal annualPlanAmount = projectInfo.getAnnualPlanAmount(); VUtils.isTrue(annualPlanAmount.compareTo(BigDecimal.ZERO) <= 0) - .throwMessage(String.format("申报失败! 年度支付总金额【{}】 不能小于等于0",annualPlanAmount)); + .throwMessage(String.format("申报失败! 年度支付总金额【%s】 不能小于等于0",annualPlanAmount)); VUtils.isTrue(annualPlanAmount.compareTo(declareAmount) > 0) - .throwMessage(String.format("申报失败! 年度支付总金额【{}】 不能大于申报金额 【{}】",annualPlanAmount,declareAmount)); + .throwMessage(String.format("申报失败! 年度支付总金额【%s】 不能大于申报金额 【%s】",annualPlanAmount,declareAmount)); BigDecimal annualGovSuperAmount = projectInfo.getAnnualPlanGovSuperiorFinanceAmount(); BigDecimal annualOwnSuperAmount = projectInfo.getAnnualPlanGovOwnFinanceAmount(); @@ -104,7 +104,7 @@ public class DefaultDeclaredProjectManage { BigDecimal totalAnnual = annualGovSuperAmount .add(annualOwnSuperAmount).add(annualBankLendingAmount).add(annualHaveAmount).add(anualOtherAmount); VUtils.isTrue(annualPlanAmount.compareTo(totalAnnual) != 0) - .throwMessage(String.format("申报失败! 年度支付总金额【{}】 不等于其它年度支付金额 【{}】",annualPlanAmount,totalAnnual)); + .throwMessage(String.format("申报失败! 年度支付总金额【%s】 不等于其它年度支付金额 【%s】",annualPlanAmount,totalAnnual)); } }