From 04eab94cc39ac4b7a1198fa5fa4b921ce6c478ea Mon Sep 17 00:00:00 2001 From: OathK1per Date: Tue, 19 Apr 2022 10:02:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E8=AE=A1=E8=AE=A1=E7=AE=97=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E6=97=B6=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/model/ProjectBudgetCostDetailRepository.java | 2 +- .../ProjectBudgetCostProjectManageDetailRepository.java | 2 +- .../work/model/ProjectBudgetIncomeDetailRepository.java | 2 +- .../java/cn/palmte/work/service/ProjectBudgetService.java | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailRepository.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailRepository.java index ca1e19a..88260ff 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailRepository.java @@ -9,4 +9,4 @@ public interface ProjectBudgetCostDetailRepository extends JpaRepository findAllByProjectIdEquals(int id); @Query(value = "select sum(amount) from project_budget_cost_detail where project_id = ?1", nativeQuery = true) - int findAmountByProject(int projectId);} + Integer findAmountByProject(int projectId);} diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailRepository.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailRepository.java index 0ea2e46..1c1e28f 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailRepository.java @@ -9,5 +9,5 @@ public interface ProjectBudgetCostProjectManageDetailRepository extends JpaRepos List findAllByProjectIdEquals(int id); @Query(value = "select sum(amount) from project_budget_cost_project_manage_detail where project_id = ?1", nativeQuery = true) - int findAmountByProject(int id); + Integer findAmountByProject(int id); } diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailRepository.java b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailRepository.java index b71a391..8d9d848 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailRepository.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetIncomeDetailRepository.java @@ -9,5 +9,5 @@ public interface ProjectBudgetIncomeDetailRepository extends JpaRepository findAllByProjectIdEquals(int id); @Query(value = "select sum(amount) from project_budget_income_detail where project_id = ?1", nativeQuery = true) - int findAmountByProject(int projectId); + Integer findAmountByProject(int projectId); } diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 6c8ce14..1b424ad 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -373,7 +373,7 @@ public class ProjectBudgetService { /** * 获取项目的收入总数量 */ - public int getBudgetIncomeAmount(Project project){ + public Integer getBudgetIncomeAmount(Project project){ return projectBudgetIncomeDetailRepository.findAmountByProject(project.getId()); } /** @@ -427,7 +427,7 @@ public class ProjectBudgetService { /** * 获取项目的成本总数量 */ - public int getBudgetCostAmount(Project project){ + public Integer getBudgetCostAmount(Project project){ return projectBudgetCostDetailRepository.findAmountByProject(project.getId()); } /** @@ -486,7 +486,7 @@ public class ProjectBudgetService { /** * 获取项目的项目管理总数量 */ - public int getBudgetCostProjectManageAmount(Project project){ + public Integer getBudgetCostProjectManageAmount(Project project){ return projectBudgetCostProjectManageDetailRepository.findAmountByProject(project.getId()); } private List getFixedNotDeletable() {