From a5827e1a88dcf659f85d82711c16741ff889c507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 25 Jul 2023 17:22:08 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=88=EC=82=B0=EB=B0=B0=EC=A0=95=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EC=A1=B0=ED=9A=8C=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faisp/main/budget/BudgetController.java | 3 +- .../main/budget/mapper/BudgetMapper.java | 3 + .../budget/model/result/AssignAmount.java | 12 + .../budget/model/result/AssignResult.java | 42 +-- .../main/budget/service/BudgetService.java | 67 ++++- .../resources/mybatisMapper/BudgetMapper.xml | 43 +++ .../resources/templates/budget/assign.html | 280 ++++++++---------- 7 files changed, 274 insertions(+), 176 deletions(-) create mode 100644 src/main/java/com/dbnt/faisp/main/budget/model/result/AssignAmount.java diff --git a/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java b/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java index 35e7038f..62663e4b 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java +++ b/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java @@ -132,7 +132,8 @@ public class BudgetController { if (requestDto.getYear() != null) { userOrgCode = requestDto.getCode(); - List list = budgetService.selectBudgetAssignInfo(loginUser, requestDto); +// List list = budgetService.selectBudgetAssignInfo(loginUser, requestDto); + List list = budgetService.selectBudgetAssignInfoList(requestDto); mav.addObject("list", list); } else { // 로그인된 해당청 기본선택 diff --git a/src/main/java/com/dbnt/faisp/main/budget/mapper/BudgetMapper.java b/src/main/java/com/dbnt/faisp/main/budget/mapper/BudgetMapper.java index 79d13ccc..d5ab5e8c 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/mapper/BudgetMapper.java +++ b/src/main/java/com/dbnt/faisp/main/budget/mapper/BudgetMapper.java @@ -15,6 +15,8 @@ public interface BudgetMapper { UpdateResult callSpUpdateBudgetPlanCodeItem(BudgetParams param); UpdateResult callSpDeleteBudgetPlan(BudgetParams param); List callSpGetBudgetAssignInfo(BudgetParams param); + List selectBudgetAssignInfoList(BudgetParams params); + List selectBudgetAssignAmountList(BudgetParams params); List callSpGetDownOrg(BudgetParams param); List callSpGetLowerOrgCodeByName(); String callSpGetHighOrgCode(BudgetParams params); @@ -25,4 +27,5 @@ public interface BudgetMapper { List callSpGetbudgetStatOrg(BudgetParams params); List callSpGetbudgetStatDetail(BudgetParams params); List callSpGetBudgetCodeL3(BudgetParams params); + } diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/result/AssignAmount.java b/src/main/java/com/dbnt/faisp/main/budget/model/result/AssignAmount.java new file mode 100644 index 00000000..847ff676 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/model/result/AssignAmount.java @@ -0,0 +1,12 @@ +package com.dbnt.faisp.main.budget.model.result; + +import lombok.Getter; + +@Getter +public class AssignAmount { + Integer orderSeq; + String organCd; + String budgetCode; + Integer periodAssignAmount; + Integer sumAssignAmount; +} diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/result/AssignResult.java b/src/main/java/com/dbnt/faisp/main/budget/model/result/AssignResult.java index 304ff8da..43fb6187 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/model/result/AssignResult.java +++ b/src/main/java/com/dbnt/faisp/main/budget/model/result/AssignResult.java @@ -1,33 +1,35 @@ package com.dbnt.faisp.main.budget.model.result; import lombok.Getter; +import lombok.Setter; @Getter +@Setter public class AssignResult { String orgCount; String budgetNameL1; String budgetNameL2; String budgetNameL3; String budgetCodeL3; - String planAmount; - String totalAssignAmount; - String periodAssignAmount1; - String sumAssignAmount1; - String periodAssignAmount2; - String sumAssignAmount2; - String periodAssignAmount3; - String sumAssignAmount3; - String periodAssignAmount4; - String sumAssignAmount4; - String periodAssignAmount5; - String sumAssignAmount5; - String periodAssignAmount6; - String sumAssignAmount6; - String periodAssignAmount7; - String sumAssignAmount7; - String periodAssignAmount8; - String sumAssignAmount8; - String periodAssignAmount9; - String sumAssignAmount9; + String planAmount = "0"; + String totalAssignAmount = "0"; + String periodAssignAmount1 = "0"; + String sumAssignAmount1 = "0"; + String periodAssignAmount2 = "0"; + String sumAssignAmount2 = "0"; + String periodAssignAmount3 = "0"; + String sumAssignAmount3 = "0"; + String periodAssignAmount4 = "0"; + String sumAssignAmount4 = "0"; + String periodAssignAmount5 = "0"; + String sumAssignAmount5 = "0"; + String periodAssignAmount6 = "0"; + String sumAssignAmount6 = "0"; + String periodAssignAmount7 = "0"; + String sumAssignAmount7 = "0"; + String periodAssignAmount8 = "0"; + String sumAssignAmount8 = "0"; + String periodAssignAmount9 = "0"; + String sumAssignAmount9 = "0"; } diff --git a/src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java b/src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java index dbb3d33f..f7607b0b 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java +++ b/src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java @@ -292,12 +292,6 @@ public class BudgetService { // 예산배정 public List selectBudgetAssignInfo(UserInfo loginUser, BudgetDto.AssignSearchReqeust requestDto){ -// System.out.println(requestDto.getCode()); -// System.out.println(requestDto.getYear()); -// System.out.println(requestDto.getStDate()); -// System.out.println(requestDto.getEdDate()); - //System.out.println(requestDto.getYear()+" / "+ requestDto.getCode()+" / "+ "admin"+" / "+ java.sql.Date.valueOf(requestDto.getStDate())+" / "+java.sql.Date.valueOf(requestDto.getEdDate())); -// return budgetRepository.callSpGetBudgetAssignInfo(requestDto.getYear(), requestDto.getCode(), "admin", java.sql.Date.valueOf(requestDto.getStDate()),java.sql.Date.valueOf(requestDto.getEdDate())); BudgetParams params = new BudgetParams(); params.setYear(requestDto.getYear()); params.setCode(requestDto.getCode()); @@ -307,6 +301,67 @@ public class BudgetService { return budgetMapper.callSpGetBudgetAssignInfo(params); } + public List selectBudgetAssignInfoList(BudgetDto.AssignSearchReqeust requestDto){ + BudgetParams params = new BudgetParams(); + params.setYear(requestDto.getYear()); + params.setCode(requestDto.getCode()); + params.setUser("admin"); + params.setStDate(java.sql.Date.valueOf(requestDto.getStDate())); + params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate())); + List assignResultList = budgetMapper.selectBudgetAssignInfoList(params); + List assignAmountList = budgetMapper.selectBudgetAssignAmountList(params); + for(AssignResult result: assignResultList){ + for(AssignAmount amount: assignAmountList){ + if(result.getBudgetCodeL3().equals(amount.getBudgetCode())){ + int totalAssignAmount = result.getTotalAssignAmount()==null?0:Integer.parseInt(result.getTotalAssignAmount()); + totalAssignAmount += amount.getSumAssignAmount(); + result.setTotalAssignAmount(Integer.toString(totalAssignAmount)); + switch (amount.getOrderSeq()){ + case 1: + result.setPeriodAssignAmount1(amount.getPeriodAssignAmount().toString()); + result.setSumAssignAmount1(amount.getSumAssignAmount().toString()); + break; + case 2: + result.setPeriodAssignAmount2(amount.getPeriodAssignAmount().toString()); + result.setSumAssignAmount2(amount.getSumAssignAmount().toString()); + break; + case 3: + result.setPeriodAssignAmount3(amount.getPeriodAssignAmount().toString()); + result.setSumAssignAmount3(amount.getSumAssignAmount().toString()); + break; + case 4: + result.setPeriodAssignAmount4(amount.getPeriodAssignAmount().toString()); + result.setSumAssignAmount4(amount.getSumAssignAmount().toString()); + break; + case 5: + result.setPeriodAssignAmount5(amount.getPeriodAssignAmount().toString()); + result.setSumAssignAmount5(amount.getSumAssignAmount().toString()); + break; + case 6: + result.setPeriodAssignAmount6(amount.getPeriodAssignAmount().toString()); + result.setSumAssignAmount6(amount.getSumAssignAmount().toString()); + break; + case 7: + result.setPeriodAssignAmount7(amount.getPeriodAssignAmount().toString()); + result.setSumAssignAmount7(amount.getSumAssignAmount().toString()); + break; + case 8: + result.setPeriodAssignAmount8(amount.getPeriodAssignAmount().toString()); + result.setSumAssignAmount8(amount.getSumAssignAmount().toString()); + break; + case 9: + result.setPeriodAssignAmount9(amount.getPeriodAssignAmount().toString()); + result.setSumAssignAmount9(amount.getSumAssignAmount().toString()); + break; + } + } + } + } + + return assignResultList; + + } + //(공통) 2단계로 하위청 뿌려주기 public List selectDownOrg(String userOrgCode){ // return budgetRepository.callSpGetDownOrg(userOrgCode); diff --git a/src/main/resources/mybatisMapper/BudgetMapper.xml b/src/main/resources/mybatisMapper/BudgetMapper.xml index e0c6d55e..f2e48248 100644 --- a/src/main/resources/mybatisMapper/BudgetMapper.xml +++ b/src/main/resources/mybatisMapper/BudgetMapper.xml @@ -36,6 +36,49 @@ select * from sp_get_budget_assign_info(#{year}, #{code}, #{user} ,#{stDate}::date, #{edDate}::date) + + -
-
-
-
-
예산배정
-
-
-
-

정보예산관리 > 예산배정

-
+
+ +
+
+
+
+
예산배정
- - -
-
-
-
- -
-
-
-
-
-
- -
-
-
- - -
-
-
- -
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
사업명구분세부내역예산총액예산총배정액
(누적)
기간배정액누적액
-
-
-
-
-
-
-
- -
+
+
+

정보예산관리 > 예산배정

+
+
+ + +
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
사업명구분세부내역예산총액예산총배정액
(누적)
기간배정액누적액
+
+
+
+
+
+
+
+ +
+
- -
+
-
+
+ + \ No newline at end of file