From 94b9b3e3dee0bde7d41ddb8e7bb167db0da9525b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 26 Jul 2023 17:27:31 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A7=91=ED=96=89=EA=B4=80=EB=A6=AC=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?=EC=88=98=EC=A0=95.=20=EC=A7=91=ED=96=89=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=ED=95=AD=EB=AA=A9=EB=93=B1=EB=A1=9D=20=EB=AA=A8=EB=8B=AC=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faisp/main/budget/BudgetController.java | 13 +- .../main/budget/mapper/BudgetMapper.java | 6 +- .../faisp/main/budget/model/BudgetDto.java | 4 +- .../budget/model/result/AssignResult.java | 8 +- .../main/budget/model/result/BudgetName.java | 15 ++ .../budget/model/result/ExpenseAmount.java | 14 ++ .../budget/model/result/ExpenseResult.java | 89 ++++---- .../main/budget/model/result/YearResult.java | 2 +- .../main/budget/service/BudgetService.java | 136 +++++++++--- .../resources/mybatisMapper/BudgetMapper.xml | 151 ++++++++----- .../resources/templates/budget/budgeting.html | 204 +++++++++--------- .../resources/templates/budget/expense.html | 57 ++--- .../resources/templates/budget/statsOrg.html | 16 +- 13 files changed, 434 insertions(+), 281 deletions(-) create mode 100644 src/main/java/com/dbnt/faisp/main/budget/model/result/BudgetName.java create mode 100644 src/main/java/com/dbnt/faisp/main/budget/model/result/ExpenseAmount.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 bcef1c56..84cc68cd 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java +++ b/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java @@ -33,7 +33,7 @@ public class BudgetController { ModelAndView mav = new ModelAndView("budget/budgeting"); if (requestDto.getYear() == null || requestDto.getYear().equals("")) { LocalDate date = LocalDate.now(); - requestDto.setYear(String.valueOf(date.getYear())); + requestDto.setYear(date.getYear()); } System.out.println(requestDto.getYear()); List list = budgetService.selectBudgetingList(loginUser, requestDto); @@ -215,7 +215,8 @@ public class BudgetController { if (requestDto.getYear() != null) { userOrgCode = requestDto.getCode(); - List list = budgetService.selectBudgetExpenseInfo(loginUser, requestDto); +// List list = budgetService.selectBudgetExpenseInfo(loginUser, requestDto); + List list = budgetService.selectBudgetExpenseInfoList(loginUser, requestDto); mav.addObject("list", list); } else { // 로그인된 해당청 기본선택 @@ -226,13 +227,14 @@ public class BudgetController { // 첫해 첫날 ~ 오늘날짜 기본세팅 LocalDate date = LocalDate.now(); - String CurrentYear = String.valueOf(date.getYear()) + "-01-01"; + String CurrentYear = date.getYear() + "-01-01"; requestDto.setStDate(LocalDate.parse(CurrentYear)); requestDto.setEdDate(date); } //하위청 리스트 List downOrgList = budgetService.selectDownOrg(userOrgCode); mav.addObject("downOrgList", downOrgList); + mav.addObject("loginOrgan", loginUser.getOgCd()); mav.addObject("searchParams", requestDto); @@ -241,11 +243,10 @@ public class BudgetController { @PostMapping("/expense") public ResultResponse saveExpense(@AuthenticationPrincipal UserInfo loginUser, @RequestBody BudgetDto.ExpenseSaveReqeust requestDto) { - budgetService.insertExpense(loginUser, requestDto); - return new ResultResponse().successResponse(ResultResponseCode.SUCCESS); + return new ResultResponse(budgetService.insertExpense(loginUser, requestDto)); } - /* 예산편성 - 팝업화면 */ + /* 집행? - 팝업화면 */ @GetMapping("/expense/modal/view") public ModelAndView viewExpenseModal(@AuthenticationPrincipal UserInfo loginUser, BudgetDto.ExpenseSearchReqeust requestDto, Pageable pageable) { ModelAndView mav = new ModelAndView("budget/expenseEditModal"); 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 ee2d2f6e..a27f6ceb 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,8 +15,6 @@ 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 selectDownOrgList(BudgetParams params); List callSpGetLowerOrgCodeByName(); @@ -29,4 +27,8 @@ public interface BudgetMapper { List callSpGetbudgetStatDetail(BudgetParams params); List callSpGetBudgetCodeL3(BudgetParams params); + + List selectBudgetInfoList(BudgetParams params); + List selectBudgetAssignAmountList(BudgetParams params); + List selectBudgetExpenseAmountList(BudgetParams params); } diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/BudgetDto.java b/src/main/java/com/dbnt/faisp/main/budget/model/BudgetDto.java index 65a64ef8..594d3498 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/model/BudgetDto.java +++ b/src/main/java/com/dbnt/faisp/main/budget/model/BudgetDto.java @@ -24,7 +24,7 @@ public class BudgetDto { @AllArgsConstructor @ToString public static class BudgetingSearchReqeust { - private String year; + private Integer year; private Long sum; } @@ -90,7 +90,7 @@ public class BudgetDto { @AllArgsConstructor @ToString public static class AssignSearchReqeust { - private String year; + private Integer year; private String code; @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate stDate; 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 43fb6187..c8ae165c 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 @@ -5,13 +5,7 @@ import lombok.Setter; @Getter @Setter -public class AssignResult { - String orgCount; - String budgetNameL1; - String budgetNameL2; - String budgetNameL3; - String budgetCodeL3; - String planAmount = "0"; +public class AssignResult extends BudgetName{ String totalAssignAmount = "0"; String periodAssignAmount1 = "0"; String sumAssignAmount1 = "0"; diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/result/BudgetName.java b/src/main/java/com/dbnt/faisp/main/budget/model/result/BudgetName.java new file mode 100644 index 00000000..df676be7 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/model/result/BudgetName.java @@ -0,0 +1,15 @@ +package com.dbnt.faisp.main.budget.model.result; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class BudgetName { + String orgCount; + String budgetNameL1; + String budgetNameL2; + String budgetNameL3; + String budgetCodeL3; + String planAmount = "0"; +} diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/result/ExpenseAmount.java b/src/main/java/com/dbnt/faisp/main/budget/model/result/ExpenseAmount.java new file mode 100644 index 00000000..729dfbec --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/model/result/ExpenseAmount.java @@ -0,0 +1,14 @@ +package com.dbnt.faisp.main.budget.model.result; + +import lombok.Getter; + +@Getter +public class ExpenseAmount { + Integer orderSeq; + String organCd; + String budgetCode; + Integer periodAssignAmount; + Integer expenseAssignAmount; + Integer balanceAmount; + Double expenseRate; +} diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/result/ExpenseResult.java b/src/main/java/com/dbnt/faisp/main/budget/model/result/ExpenseResult.java index 252059de..a8ee5fb3 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/model/result/ExpenseResult.java +++ b/src/main/java/com/dbnt/faisp/main/budget/model/result/ExpenseResult.java @@ -1,63 +1,60 @@ package com.dbnt.faisp.main.budget.model.result; import lombok.Getter; +import lombok.Setter; @Getter -public class ExpenseResult { - String orgCount; - String budgetNameL1; - String budgetNameL2; - String budgetNameL3; - String budgetCodeL3; - String planAmount; - String totalAssignAmount; - String expenseTAmount; - String balanceTAmount; - Integer periodAssignAmount1; - Integer expensePAmount1; - Integer blanceAmount1; - Integer expenseRate1; +@Setter +public class ExpenseResult extends BudgetName{ + Integer totalAssignAmount = 0; + Integer expenseTAmount = 0; + Integer balanceTAmount = 0; - String periodAssignAmount2; - String expensePAmount2; - String blanceAmount2; - String expenseRate2; + Integer periodAssignAmount1 = 0; + Integer expensePAmount1 = 0; + Integer balanceAmount1 = 0; + Double expenseRate1 = 0d; - String periodAssignAmount3; - String expensePAmount3; - String blanceAmount3; - String expenseRate3; + Integer periodAssignAmount2 = 0; + Integer expensePAmount2 = 0; + Integer balanceAmount2 = 0; + Double expenseRate2 = 0d; + + Integer periodAssignAmount3 = 0; + Integer expensePAmount3 = 0; + Integer balanceAmount3 = 0; + Double expenseRate3 = 0d; - String periodAssignAmount4; - String expensePAmount4; - String blanceAmount4; - String expenseRate4; + Integer periodAssignAmount4 = 0; + Integer expensePAmount4 = 0; + Integer balanceAmount4 = 0; + Double expenseRate4 = 0d; - String periodAssignAmount5; - String expensePAmount5; - String blanceAmount5; - String expenseRate5; + Integer periodAssignAmount5 = 0; + Integer expensePAmount5 = 0; + Integer balanceAmount5 = 0; + Double expenseRate5 = 0d; - String periodAssignAmount6; - String expensePAmount6; - String blanceAmount6; - String expenseRate6; + Integer periodAssignAmount6 = 0; + Integer expensePAmount6 = 0; + Integer balanceAmount6 = 0; + Double expenseRate6 = 0d; - String periodAssignAmount7; - String expensePAmount7; - String blanceAmount7; - String expenseRate7; + Integer periodAssignAmount7 = 0; + Integer expensePAmount7 = 0; + Integer balanceAmount7 = 0; + Double expenseRate7 = 0d; - String periodAssignAmount8; - String expensePAmount8; - String blanceAmount8; - String expenseRate8; + Integer periodAssignAmount8 = 0; + Integer expensePAmount8 = 0; + Integer balanceAmount8 = 0; + Double expenseRate8 = 0d; - String periodAssignAmount9; - String expensePAmount9; - String blanceAmount9; - String expenseRate9; + Integer periodAssignAmount9 = 0; + Integer expensePAmount9 = 0; + Integer balanceAmount9 = 0; + Double expenseRate9 = 0d; } diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/result/YearResult.java b/src/main/java/com/dbnt/faisp/main/budget/model/result/YearResult.java index 257e7304..958f26f8 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/model/result/YearResult.java +++ b/src/main/java/com/dbnt/faisp/main/budget/model/result/YearResult.java @@ -4,5 +4,5 @@ import lombok.Getter; @Getter public class YearResult { - String year; + Integer year; } 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 952f83cb..c6369656 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 @@ -37,7 +37,7 @@ public class BudgetService { /*return budgetRepository.callSpGetBudgetPlanInfo(requestDto.getYear(), "OG001", "admin");*/ BudgetParams param = new BudgetParams(); - param.setCode1(requestDto.getYear()); + param.setCode1(requestDto.getYear().toString()); param.setCode2("OG001"); param.setCode3("admin"); return budgetMapper.callSpGetBudgetPlanInfo(param); @@ -276,7 +276,7 @@ public class BudgetService { // 예산배정 public List selectBudgetAssignInfo(UserInfo loginUser, BudgetDto.AssignSearchReqeust requestDto){ BudgetParams params = new BudgetParams(); - params.setYear(requestDto.getYear()); + params.setYear(requestDto.getYear().toString()); params.setCode(requestDto.getCode()); params.setUser("admin"); params.setStDate(requestDto.getStDate()); @@ -286,14 +286,21 @@ public class BudgetService { public List selectBudgetAssignInfoList(BudgetDto.AssignSearchReqeust requestDto){ BudgetParams params = new BudgetParams(); - params.setYear(requestDto.getYear()); + params.setYear(requestDto.getYear().toString()); params.setCode(requestDto.getCode()); params.setUser("admin"); params.setStDate(requestDto.getStDate()); params.setEdDate(requestDto.getEdDate()); - List assignResultList = budgetMapper.selectBudgetAssignInfoList(params); + List assignResultList = new ArrayList<>(); + List budgetList = budgetMapper.selectBudgetInfoList(params); List assignAmountList = budgetMapper.selectBudgetAssignAmountList(params); - for(AssignResult result: assignResultList){ + for(BudgetName budget: budgetList){ + AssignResult result = new AssignResult(); + result.setBudgetNameL1(budget.getBudgetNameL1()); + result.setBudgetNameL2(budget.getBudgetNameL2()); + result.setBudgetNameL3(budget.getBudgetNameL3()); + result.setBudgetCodeL3(budget.getBudgetCodeL3()); + result.setPlanAmount(budget.getPlanAmount()); for(AssignAmount amount: assignAmountList){ if(result.getBudgetCodeL3().equals(amount.getBudgetCode())){ int totalAssignAmount = result.getTotalAssignAmount()==null?0:Integer.parseInt(result.getTotalAssignAmount()); @@ -339,6 +346,7 @@ public class BudgetService { } } } + assignResultList.add(result); } return assignResultList; @@ -393,13 +401,8 @@ public class BudgetService { //집행관리 public List selectBudgetExpenseInfo(UserInfo loginUser, BudgetDto.AssignSearchReqeust requestDto){ -// System.out.println(requestDto.getYear()); -// System.out.println(requestDto.getCode()); -// System.out.println(java.sql.Date.valueOf(requestDto.getStDate())); -// System.out.println(requestDto.getEdDate()); -// return budgetRepository.callSpGetBudgetExpenseInfo(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.setYear(requestDto.getYear().toString()); params.setCode(requestDto.getCode()); params.setUser("admin"); params.setStDate(requestDto.getStDate()); @@ -407,49 +410,120 @@ public class BudgetService { return budgetMapper.callSpGetBudgetExpenseInfo(params); } + public List selectBudgetExpenseInfoList(UserInfo loginUser, BudgetDto.AssignSearchReqeust requestDto){ + BudgetParams params = new BudgetParams(); + params.setYear(requestDto.getYear().toString()); + params.setCode(requestDto.getCode()); + params.setUser("admin"); + params.setStDate(requestDto.getStDate()); + params.setEdDate(requestDto.getEdDate()); + List expenseList = new ArrayList<>(); + List budgetList = budgetMapper.selectBudgetInfoList(params); + List amountList = budgetMapper.selectBudgetExpenseAmountList(params); + for(BudgetName budget : budgetList){ + ExpenseResult result = new ExpenseResult(); + result.setBudgetNameL1(budget.getBudgetNameL1()); + result.setBudgetNameL2(budget.getBudgetNameL2()); + result.setBudgetNameL3(budget.getBudgetNameL3()); + result.setBudgetCodeL3(budget.getBudgetCodeL3()); + result.setPlanAmount(budget.getPlanAmount()); + for(ExpenseAmount amount : amountList){ + if(result.getBudgetCodeL3().equals(amount.getBudgetCode())){ + result.setTotalAssignAmount(result.getTotalAssignAmount()+amount.getPeriodAssignAmount()); + result.setExpenseTAmount(result.getExpenseTAmount()+amount.getExpenseAssignAmount()); + result.setBalanceTAmount(result.getBalanceTAmount()+ amount.getBalanceAmount()); + switch (amount.getOrderSeq()){ + case 1: + result.setPeriodAssignAmount1(amount.getPeriodAssignAmount()); + result.setExpensePAmount1(amount.getExpenseAssignAmount()); + result.setBalanceAmount1(amount.getBalanceAmount()); + result.setExpenseRate1(amount.getExpenseRate()); + break; + case 2: + result.setPeriodAssignAmount2(amount.getPeriodAssignAmount()); + result.setExpensePAmount2(amount.getExpenseAssignAmount()); + result.setBalanceAmount2(amount.getBalanceAmount()); + result.setExpenseRate2(amount.getExpenseRate()); + break; + case 3: + result.setPeriodAssignAmount3(amount.getPeriodAssignAmount()); + result.setExpensePAmount3(amount.getExpenseAssignAmount()); + result.setBalanceAmount3(amount.getBalanceAmount()); + result.setExpenseRate3(amount.getExpenseRate()); + break; + case 4: + result.setPeriodAssignAmount4(amount.getPeriodAssignAmount()); + result.setExpensePAmount4(amount.getExpenseAssignAmount()); + result.setBalanceAmount4(amount.getBalanceAmount()); + result.setExpenseRate4(amount.getExpenseRate()); + break; + case 5: + result.setPeriodAssignAmount5(amount.getPeriodAssignAmount()); + result.setExpensePAmount5(amount.getExpenseAssignAmount()); + result.setBalanceAmount5(amount.getBalanceAmount()); + result.setExpenseRate5(amount.getExpenseRate()); + break; + case 6: + result.setPeriodAssignAmount6(amount.getPeriodAssignAmount()); + result.setExpensePAmount6(amount.getExpenseAssignAmount()); + result.setBalanceAmount6(amount.getBalanceAmount()); + result.setExpenseRate6(amount.getExpenseRate()); + break; + case 7: + result.setPeriodAssignAmount7(amount.getPeriodAssignAmount()); + result.setExpensePAmount7(amount.getExpenseAssignAmount()); + result.setBalanceAmount7(amount.getBalanceAmount()); + result.setExpenseRate7(amount.getExpenseRate()); + break; + case 8: + result.setPeriodAssignAmount8(amount.getPeriodAssignAmount()); + result.setExpensePAmount8(amount.getExpenseAssignAmount()); + result.setBalanceAmount8(amount.getBalanceAmount()); + result.setExpenseRate8(amount.getExpenseRate()); + break; + case 9: + result.setPeriodAssignAmount9(amount.getPeriodAssignAmount()); + result.setExpensePAmount9(amount.getExpenseAssignAmount()); + result.setBalanceAmount9(amount.getBalanceAmount()); + result.setExpenseRate9(amount.getExpenseRate()); + break; + } + } + } + expenseList.add(result); + } + return expenseList; + } + public List selectBudgetExpense(UserInfo loginUser, BudgetDto.ExpenseSearchReqeust requestDto){ -// System.out.println(requestDto.getYear()); -// System.out.println(requestDto.getNameL1()); -// System.out.println(requestDto.getNameL2()); -// System.out.println(requestDto.getNameL3()); -// return budgetRepository.callSpGetBudgetExpense(requestDto.getYear(), requestDto.getNameL1(), requestDto.getNameL2(), requestDto.getNameL3(), "본청"); BudgetParams params = new BudgetParams(); params.setYear(requestDto.getYear()); params.setCode1(requestDto.getNameL1()); params.setCode2(requestDto.getNameL2()); params.setCode3(requestDto.getNameL3()); - params.setOrg("본청"); + params.setOrg(loginUser.getOgCd()); return budgetMapper.callSpGetBudgetExpense(params); } @Transactional - public void insertExpense(UserInfo loginUser, BudgetDto.ExpenseSaveReqeust requestDto){ -// System.out.println(requestDto.getYear()); -// System.out.println(requestDto.getNameL1()); -// System.out.println(requestDto.getNameL2()); -// System.out.println(requestDto.getNameL3()); -// UpdateResult result = budgetRepository.callSpAddBudgetExpense(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "본청", requestDto.getItem(), requestDto.getAmount(), java.sql.Date.valueOf(requestDto.getExpenseDate())); - + public ResultResponseCode insertExpense(UserInfo loginUser, BudgetDto.ExpenseSaveReqeust requestDto){ BudgetParams params = new BudgetParams(); params.setYear(requestDto.getYear()); params.setCode1(requestDto.getNameL1()); params.setCode2(requestDto.getNameL2()); params.setCode3(requestDto.getNameL3()); - params.setOrg("본청"); + params.setOrg(loginUser.getOgCd()); params.setItem(requestDto.getItem()); params.setAmount(requestDto.getAmount()); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); params.setDt(formatter.format(requestDto.getExpenseDate())); UpdateResult result = budgetMapper.callSpAddBudgetExpense(params); -// System.out.println(result.getErrorMessage()); -// System.out.println(result.getResultCode()); -// System.out.println(result.getResultCount()); if(result.getResultCode().equals("100")) { - return; + return ResultResponseCode.SUCCESS; }else if(result.getResultCode().equals("71")) { - throw new BaseException(ResultResponseCode.EXPENSE_OVER_VALUE); + return ResultResponseCode.EXPENSE_OVER_VALUE; } else { - throw new BaseException(ResultResponseCode.ERROR); + return ResultResponseCode.ERROR; } } diff --git a/src/main/resources/mybatisMapper/BudgetMapper.xml b/src/main/resources/mybatisMapper/BudgetMapper.xml index 8ba70547..6c5445ff 100644 --- a/src/main/resources/mybatisMapper/BudgetMapper.xml +++ b/src/main/resources/mybatisMapper/BudgetMapper.xml @@ -36,58 +36,7 @@ select * from sp_get_budget_assign_info(#{year}, #{code}, #{user} ,#{stDate}::date, #{edDate}::date) - - + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/budget/budgeting.html b/src/main/resources/templates/budget/budgeting.html index 6d4e831f..61c2d610 100644 --- a/src/main/resources/templates/budget/budgeting.html +++ b/src/main/resources/templates/budget/budgeting.html @@ -3,114 +3,116 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - +
-
- -
-
-
-
-
예산편성
+
+ +
+
+
+
+
예산편성
+
+
+
+

정보예산관리 > 예산편성

+
+
+ + +
+
+
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
선택사업명구분세부내역편성액
합계
+
+
+ +
+
+ + +
-

정보예산관리 > 예산편성

+
-
- - -
-
-
-
-
-
-
-
- -
-
- -
-
- -
-
-
-
- -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
선택사업명구분세부내역편성액
합계
-
-
-
-
- - - -
-
- -
-
- - -
-
- - - -
+
+ +
+
+ + +
-
+
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/budget/expense.html b/src/main/resources/templates/budget/expense.html index e2b73adf..ebe8af81 100644 --- a/src/main/resources/templates/budget/expense.html +++ b/src/main/resources/templates/budget/expense.html @@ -38,12 +38,17 @@
- + + + + + +
@@ -69,12 +74,14 @@ 예산총액 예산총배정액
(누적) 집행액(총계) - + + + 지출총액 보유잔액 - + 배정액 지출총액 잔액 @@ -95,53 +102,53 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/src/main/resources/templates/budget/statsOrg.html b/src/main/resources/templates/budget/statsOrg.html index cb29c9a9..7a14cebc 100644 --- a/src/main/resources/templates/budget/statsOrg.html +++ b/src/main/resources/templates/budget/statsOrg.html @@ -115,49 +115,49 @@ - 11 + 11 - + - + - + - + - + - + - +