From 6c5e9688615e3e2ac26c9b393b4a88358af654c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= Date: Thu, 27 Jul 2023 18:41:53 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=88=EC=82=B0=ED=86=B5=EA=B3=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faisp/main/budget/BudgetController.java | 82 ++++++++------ .../main/budget/mapper/BudgetMapper.java | 1 + .../faisp/main/budget/model/BudgetDto.java | 11 +- .../faisp/main/budget/model/BudgetParams.java | 2 +- .../budget/model/result/ExpenseResult.java | 61 +++++------ .../model/result/StatsDetailResult.java | 15 +++ .../main/budget/service/BudgetService.java | 101 +++++++++++------- .../resources/mybatisMapper/BudgetMapper.xml | 45 +++++++- .../resources/static/js/budget/statsDetail.js | 2 +- .../resources/templates/budget/assign.html | 7 +- .../resources/templates/budget/expense.html | 7 +- .../templates/budget/statsDetail.html | 40 ++++--- .../resources/templates/budget/statsOrg.html | 56 ++++++---- 13 files changed, 273 insertions(+), 157 deletions(-) create mode 100644 src/main/java/com/dbnt/faisp/main/budget/model/result/StatsDetailResult.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 84cc68cd..6c7168c9 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java +++ b/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java @@ -31,7 +31,7 @@ public class BudgetController { @GetMapping("/budgeting") public ModelAndView viewShipList(@AuthenticationPrincipal UserInfo loginUser, BudgetDto.BudgetingSearchReqeust requestDto, Pageable pageable) { ModelAndView mav = new ModelAndView("budget/budgeting"); - if (requestDto.getYear() == null || requestDto.getYear().equals("")) { + if (requestDto.getYear() == null) { LocalDate date = LocalDate.now(); requestDto.setYear(date.getYear()); } @@ -148,9 +148,10 @@ public class BudgetController { requestDto.setStDate(LocalDate.parse(CurrentYear)); requestDto.setEdDate(date); } - //하위청 리스트 - List downOrgList = budgetService.selectDownOrg(userOrgCode); - mav.addObject("downOrgList", downOrgList); + //하위청 리스트 - 검색용 + mav.addObject("downOrgList", budgetService.selectDownOrg(loginUser.getOgCd())); + //하위청 리스트 - 목록용 + mav.addObject("downList", budgetService.selectDownOrg(requestDto.getCode())); mav.addObject("loginOrgan", loginUser.getOgCd()); mav.addObject("searchParams", requestDto); @@ -186,7 +187,7 @@ public class BudgetController { mav.addObject("list"); } //하위청 리스트 - List downOrgList = budgetService.selectDownOrg(userOrgCode); + List downOrgList = budgetService.selectDownOrg(loginUser.getOgCd()); mav.addObject("downOrgList", downOrgList); List codeList = budgetService.selectGetLowerOrgCodeByName(loginUser); @@ -216,7 +217,13 @@ public class BudgetController { userOrgCode = requestDto.getCode(); // List list = budgetService.selectBudgetExpenseInfo(loginUser, requestDto); - List list = budgetService.selectBudgetExpenseInfoList(loginUser, requestDto); + BudgetParams params = new BudgetParams(); + params.setYear(requestDto.getYear().toString()); + params.setCode(requestDto.getCode()); + params.setUser(loginUser.getUserId()); + params.setStDate(requestDto.getStDate()); + params.setEdDate(requestDto.getEdDate()); + List list = budgetService.selectBudgetExpenseInfoList(params); mav.addObject("list", list); } else { // 로그인된 해당청 기본선택 @@ -231,9 +238,10 @@ public class BudgetController { requestDto.setStDate(LocalDate.parse(CurrentYear)); requestDto.setEdDate(date); } - //하위청 리스트 - List downOrgList = budgetService.selectDownOrg(userOrgCode); - mav.addObject("downOrgList", downOrgList); + //하위청 리스트 - 검색용 + mav.addObject("downOrgList", budgetService.selectDownOrg(loginUser.getOgCd())); + //하위청 리스트 - 목록용 + mav.addObject("downList", budgetService.selectDownOrg(requestDto.getCode())); mav.addObject("loginOrgan", loginUser.getOgCd()); mav.addObject("searchParams", requestDto); @@ -271,15 +279,7 @@ public class BudgetController { mav.addObject("list", list); } else { // 로그인된 해당청 기본선택 - userOrgCode = userInfoService.selectUserInfo(loginUser.getUserSeq()).getOgCd(); - String HighOrgCode = budgetService.selectGetHighOrgCode(userOrgCode); - if (HighOrgCode == null) { // 1, 2단계시 - requestDto.setCode(userOrgCode); - } else { // 3단계 이하 관서시 - requestDto.setCode(HighOrgCode); - userOrgCode = HighOrgCode; - } - + userOrgCode = loginUser.getOgCd(); mav.addObject("list"); // 첫해 첫날 ~ 오늘날짜 기본세팅 @@ -289,7 +289,7 @@ public class BudgetController { requestDto.setEdDate(date); } //하위청 리스트 - List downOrgList = budgetService.selectDownOrg(userOrgCode); + List downOrgList = budgetService.selectDownOrg(loginUser.getOgCd()); mav.addObject("downOrgList", downOrgList); List codeList = budgetService.selectGetLowerOrgCodeByName(loginUser); @@ -302,13 +302,22 @@ public class BudgetController { /* 집행표 - 화면 */ @GetMapping("/stats/org") - public ModelAndView viewExpenseList(@AuthenticationPrincipal UserInfo loginUser, BudgetDto.StatsSearchReqeust requestDto, Pageable pageable) { + public ModelAndView viewExpenseList(@AuthenticationPrincipal UserInfo loginUser, BudgetDto.StatsSearchReqeust requestDto) { ModelAndView mav = new ModelAndView("budget/statsOrg"); String userOrgCode; if (requestDto.getYear() != null) { userOrgCode = requestDto.getCode(); - List list = budgetService.selectSpGetbudgetStatOrg(loginUser, requestDto); +// List list = budgetService.selectSpGetbudgetStatOrg(loginUser, requestDto); + BudgetParams params = new BudgetParams(); + params.setYear(requestDto.getYear().toString()); + params.setCode(requestDto.getCode()); + params.setUser(loginUser.getUserId()); + params.setStDate(requestDto.getStDate()); + params.setEdDate(requestDto.getEdDate()); + params.setWon(requestDto.getWon()); + List list = budgetService.selectBudgetExpenseInfoList(params); + mav.addObject("list", list); } else { // 로그인된 해당청 기본선택 @@ -329,13 +338,11 @@ public class BudgetController { requestDto.setStDate(LocalDate.parse(CurrentYear)); requestDto.setEdDate(date); } - //하위청 리스트 - List downOrgList = budgetService.selectDownOrg(userOrgCode); - mav.addObject("downOrgList", downOrgList); - - List codeList = budgetService.selectGetLowerOrgCodeByName(loginUser); - mav.addObject("codeList", codeList); - + //하위청 리스트 - 검색용 + mav.addObject("downOrgList", budgetService.selectDownOrg(loginUser.getOgCd())); + //하위청 리스트 - 목록용 + mav.addObject("downList", budgetService.selectDownOrg(requestDto.getCode())); + mav.addObject("loginOrgan", loginUser.getOgCd()); mav.addObject("searchParams", requestDto); return mav; @@ -348,24 +355,29 @@ public class BudgetController { List yearList = budgetService.selectBudgetingYearList(loginUser); if (requestDto.getStDate() != null) { - List list = budgetService.selectSpGetbudgetStatDetail(loginUser, requestDto); +// List list = budgetService.selectSpGetbudgetStatDetail(loginUser, requestDto); + List list = budgetService.selectStatDetailList(requestDto); List codeList = budgetService.selectSpGetL3Code(loginUser, requestDto.getYear()); mav.addObject("list", list); mav.addObject("codeList", codeList); } else { - LocalDate date = LocalDate.now(); - List codeList = budgetService.selectSpGetL3Code(loginUser, String.valueOf(date.getYear())); - requestDto.setYear(String.valueOf(date.getYear())); + List codeList = budgetService.selectSpGetL3Code(loginUser, date.getYear()); + requestDto.setYear(date.getYear()); mav.addObject("list"); mav.addObject("codeList", codeList); - + requestDto.setCode(loginUser.getOgCd()); // 첫해 첫날 ~ 오늘날짜 기본세팅 - String CurrentYear = String.valueOf(date.getYear()) + "-01-01"; + String CurrentYear = date.getYear() + "-01-01"; requestDto.setStDate(LocalDate.parse(CurrentYear)); requestDto.setEdDate(date); } - List codeList = budgetService.selectGetLowerOrgCodeByName(loginUser); + + //하위청 리스트 - 검색용 + mav.addObject("downOrgList", budgetService.selectDownOrg(loginUser.getOgCd())); + //하위청 리스트 - 목록용 + mav.addObject("downList", budgetService.selectDownOrg(requestDto.getCode())); + mav.addObject("loginOrgan", loginUser.getOgCd()); mav.addObject("yearList", yearList); mav.addObject("searchParams", requestDto); 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 a27f6ceb..548eda49 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 @@ -31,4 +31,5 @@ public interface BudgetMapper { List selectBudgetInfoList(BudgetParams params); List selectBudgetAssignAmountList(BudgetParams params); List selectBudgetExpenseAmountList(BudgetParams params); + List selectStatDetailList(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 594d3498..89dde960 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 @@ -14,10 +14,9 @@ public class BudgetDto { @AllArgsConstructor @ToString public static class BudgetingListResponse { - - private String budget_name_l1; - private String budget_name_l2; - private String budget_name_l3; + private String budgetNameL1; + private String budgetNameL2; + private String budgetNameL3; } @Data @@ -123,7 +122,7 @@ public class BudgetDto { @AllArgsConstructor @ToString public static class StatsSearchReqeust { - private String year; + private Integer year; private String code; private String item; @DateTimeFormat(pattern = "yyyy-MM-dd") @@ -151,7 +150,7 @@ public class BudgetDto { @AllArgsConstructor @ToString public static class L3CodeRequest { - private String year; + private Integer year; } } diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/BudgetParams.java b/src/main/java/com/dbnt/faisp/main/budget/model/BudgetParams.java index ee60a375..21447ebc 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/model/BudgetParams.java +++ b/src/main/java/com/dbnt/faisp/main/budget/model/BudgetParams.java @@ -22,7 +22,7 @@ public class BudgetParams { private String user; private String id; private String item; - private Integer won; + private Integer won = 1; private String newCode1; private String newCode2; 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 a8ee5fb3..c93dcf05 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 @@ -6,55 +6,56 @@ import lombok.Setter; @Getter @Setter public class ExpenseResult extends BudgetName{ - Integer totalAssignAmount = 0; - Integer expenseTAmount = 0; - Integer balanceTAmount = 0; + Double totalAssignAmount = 0d; + Double expenseTAmount = 0d; + Double balanceTAmount = 0d; + Double taRate = 0d; - Integer periodAssignAmount1 = 0; - Integer expensePAmount1 = 0; - Integer balanceAmount1 = 0; + Double periodAssignAmount1 = 0d; + Double expensePAmount1 = 0d; + Double balanceAmount1 = 0d; Double expenseRate1 = 0d; - Integer periodAssignAmount2 = 0; - Integer expensePAmount2 = 0; - Integer balanceAmount2 = 0; + Double periodAssignAmount2 = 0d; + Double expensePAmount2 = 0d; + Double balanceAmount2 = 0d; Double expenseRate2 = 0d; - Integer periodAssignAmount3 = 0; - Integer expensePAmount3 = 0; - Integer balanceAmount3 = 0; + Double periodAssignAmount3 = 0d; + Double expensePAmount3 = 0d; + Double balanceAmount3 = 0d; Double expenseRate3 = 0d; - Integer periodAssignAmount4 = 0; - Integer expensePAmount4 = 0; - Integer balanceAmount4 = 0; + Double periodAssignAmount4 = 0d; + Double expensePAmount4 = 0d; + Double balanceAmount4 = 0d; Double expenseRate4 = 0d; - Integer periodAssignAmount5 = 0; - Integer expensePAmount5 = 0; - Integer balanceAmount5 = 0; + Double periodAssignAmount5 = 0d; + Double expensePAmount5 = 0d; + Double balanceAmount5 = 0d; Double expenseRate5 = 0d; - Integer periodAssignAmount6 = 0; - Integer expensePAmount6 = 0; - Integer balanceAmount6 = 0; + Double periodAssignAmount6 = 0d; + Double expensePAmount6 = 0d; + Double balanceAmount6 = 0d; Double expenseRate6 = 0d; - Integer periodAssignAmount7 = 0; - Integer expensePAmount7 = 0; - Integer balanceAmount7 = 0; + Double periodAssignAmount7 = 0d; + Double expensePAmount7 = 0d; + Double balanceAmount7 = 0d; Double expenseRate7 = 0d; - Integer periodAssignAmount8 = 0; - Integer expensePAmount8 = 0; - Integer balanceAmount8 = 0; + Double periodAssignAmount8 = 0d; + Double expensePAmount8 = 0d; + Double balanceAmount8 = 0d; Double expenseRate8 = 0d; - Integer periodAssignAmount9 = 0; - Integer expensePAmount9 = 0; - Integer balanceAmount9 = 0; + Double periodAssignAmount9 = 0d; + Double expensePAmount9 = 0d; + Double balanceAmount9 = 0d; Double expenseRate9 = 0d; } diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/result/StatsDetailResult.java b/src/main/java/com/dbnt/faisp/main/budget/model/result/StatsDetailResult.java new file mode 100644 index 00000000..37ada3c2 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/model/result/StatsDetailResult.java @@ -0,0 +1,15 @@ +package com.dbnt.faisp.main.budget.model.result; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class StatsDetailResult { + String organCd; + Double planAmount = 0d; + Double assignAmount = 0d; + Double expenseAmount = 0d; + Double balanceAmount = 0d; + Double rate = 0d; +} 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 c6369656..d801f071 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 @@ -410,16 +410,11 @@ 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()); + public List selectBudgetExpenseInfoList(BudgetParams params){ List expenseList = new ArrayList<>(); List budgetList = budgetMapper.selectBudgetInfoList(params); List amountList = budgetMapper.selectBudgetExpenseAmountList(params); + Integer wonUnit = params.getWon(); for(BudgetName budget : budgetList){ ExpenseResult result = new ExpenseResult(); result.setBudgetNameL1(budget.getBudgetNameL1()); @@ -429,62 +424,62 @@ public class BudgetService { 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()); + result.setTotalAssignAmount(result.getTotalAssignAmount()+(double)(amount.getPeriodAssignAmount()/wonUnit)); + result.setExpenseTAmount(result.getExpenseTAmount()+(double)(amount.getExpenseAssignAmount()/wonUnit)); + result.setBalanceTAmount(result.getBalanceTAmount()+ (double)(amount.getBalanceAmount()/wonUnit)); switch (amount.getOrderSeq()){ case 1: - result.setPeriodAssignAmount1(amount.getPeriodAssignAmount()); - result.setExpensePAmount1(amount.getExpenseAssignAmount()); - result.setBalanceAmount1(amount.getBalanceAmount()); + result.setPeriodAssignAmount1((double)amount.getPeriodAssignAmount()/wonUnit); + result.setExpensePAmount1((double)amount.getExpenseAssignAmount()/wonUnit); + result.setBalanceAmount1((double)amount.getBalanceAmount()/wonUnit); result.setExpenseRate1(amount.getExpenseRate()); break; case 2: - result.setPeriodAssignAmount2(amount.getPeriodAssignAmount()); - result.setExpensePAmount2(amount.getExpenseAssignAmount()); - result.setBalanceAmount2(amount.getBalanceAmount()); + result.setPeriodAssignAmount2((double)amount.getPeriodAssignAmount()/wonUnit); + result.setExpensePAmount2((double)amount.getExpenseAssignAmount()/wonUnit); + result.setBalanceAmount2((double)amount.getBalanceAmount()/wonUnit); result.setExpenseRate2(amount.getExpenseRate()); break; case 3: - result.setPeriodAssignAmount3(amount.getPeriodAssignAmount()); - result.setExpensePAmount3(amount.getExpenseAssignAmount()); - result.setBalanceAmount3(amount.getBalanceAmount()); + result.setPeriodAssignAmount3((double)amount.getPeriodAssignAmount()/wonUnit); + result.setExpensePAmount3((double)amount.getExpenseAssignAmount()/wonUnit); + result.setBalanceAmount3((double)amount.getBalanceAmount()/wonUnit); result.setExpenseRate3(amount.getExpenseRate()); break; case 4: - result.setPeriodAssignAmount4(amount.getPeriodAssignAmount()); - result.setExpensePAmount4(amount.getExpenseAssignAmount()); - result.setBalanceAmount4(amount.getBalanceAmount()); + result.setPeriodAssignAmount4((double)amount.getPeriodAssignAmount()/wonUnit); + result.setExpensePAmount4((double)amount.getExpenseAssignAmount()/wonUnit); + result.setBalanceAmount4((double)amount.getBalanceAmount()/wonUnit); result.setExpenseRate4(amount.getExpenseRate()); break; case 5: - result.setPeriodAssignAmount5(amount.getPeriodAssignAmount()); - result.setExpensePAmount5(amount.getExpenseAssignAmount()); - result.setBalanceAmount5(amount.getBalanceAmount()); + result.setPeriodAssignAmount5((double)amount.getPeriodAssignAmount()/wonUnit); + result.setExpensePAmount5((double)amount.getExpenseAssignAmount()/wonUnit); + result.setBalanceAmount5((double)amount.getBalanceAmount()/wonUnit); result.setExpenseRate5(amount.getExpenseRate()); break; case 6: - result.setPeriodAssignAmount6(amount.getPeriodAssignAmount()); - result.setExpensePAmount6(amount.getExpenseAssignAmount()); - result.setBalanceAmount6(amount.getBalanceAmount()); + result.setPeriodAssignAmount6((double)amount.getPeriodAssignAmount()/wonUnit); + result.setExpensePAmount6((double)amount.getExpenseAssignAmount()/wonUnit); + result.setBalanceAmount6((double)amount.getBalanceAmount()/wonUnit); result.setExpenseRate6(amount.getExpenseRate()); break; case 7: - result.setPeriodAssignAmount7(amount.getPeriodAssignAmount()); - result.setExpensePAmount7(amount.getExpenseAssignAmount()); - result.setBalanceAmount7(amount.getBalanceAmount()); + result.setPeriodAssignAmount7((double)amount.getPeriodAssignAmount()/wonUnit); + result.setExpensePAmount7((double)amount.getExpenseAssignAmount()/wonUnit); + result.setBalanceAmount7((double)amount.getBalanceAmount()/wonUnit); result.setExpenseRate7(amount.getExpenseRate()); break; case 8: - result.setPeriodAssignAmount8(amount.getPeriodAssignAmount()); - result.setExpensePAmount8(amount.getExpenseAssignAmount()); - result.setBalanceAmount8(amount.getBalanceAmount()); + result.setPeriodAssignAmount8((double)amount.getPeriodAssignAmount()/wonUnit); + result.setExpensePAmount8((double)amount.getExpenseAssignAmount()/wonUnit); + result.setBalanceAmount8((double)amount.getBalanceAmount()/wonUnit); result.setExpenseRate8(amount.getExpenseRate()); break; case 9: - result.setPeriodAssignAmount9(amount.getPeriodAssignAmount()); - result.setExpensePAmount9(amount.getExpenseAssignAmount()); - result.setBalanceAmount9(amount.getBalanceAmount()); + result.setPeriodAssignAmount9((double)amount.getPeriodAssignAmount()/wonUnit); + result.setExpensePAmount9((double)amount.getExpenseAssignAmount()/wonUnit); + result.setBalanceAmount9((double)amount.getBalanceAmount()/wonUnit); result.setExpenseRate9(amount.getExpenseRate()); break; } @@ -492,6 +487,9 @@ public class BudgetService { } expenseList.add(result); } + for(ExpenseResult result : expenseList){ + result.setTaRate(Math.round((result.getExpenseTAmount()/(result.getBalanceTAmount()+result.getExpenseTAmount()))*10000)/100.0); + } return expenseList; } @@ -537,7 +535,7 @@ public class BudgetService { // return budgetRepository.callSpGetbudgetStatOrg(requestDto.getYear(), requestDto.getCode(), "admin", java.sql.Date.valueOf(requestDto.getStDate()), java.sql.Date.valueOf(requestDto.getEdDate()), requestDto.getWon()); BudgetParams params = new BudgetParams(); - params.setYear(requestDto.getYear()); + params.setYear(requestDto.getYear().toString()); params.setCode(requestDto.getCode()); params.setUser("admin"); params.setStDate(requestDto.getStDate()); @@ -555,7 +553,7 @@ public class BudgetService { // return budgetRepository.callSpGetbudgetStatDetail(requestDto.getYear(), requestDto.getCode(), requestDto.getItem(), "admin", java.sql.Date.valueOf(requestDto.getStDate()), java.sql.Date.valueOf(requestDto.getEdDate()), requestDto.getWon()); BudgetParams params = new BudgetParams(); - params.setYear(requestDto.getYear()); + params.setYear(requestDto.getYear().toString()); params.setCode(requestDto.getCode()); params.setItem(requestDto.getItem()); params.setUser("admin"); @@ -565,12 +563,33 @@ public class BudgetService { return budgetMapper.callSpGetbudgetStatDetail(params); } - public List selectSpGetL3Code(UserInfo loginUser, String year){ + public List selectStatDetailList(BudgetDto.StatsSearchReqeust requestDto){ + BudgetParams params = new BudgetParams(); + params.setYear(requestDto.getYear().toString()); + params.setCode(requestDto.getCode()); + params.setItem(requestDto.getItem()); + params.setUser("admin"); + params.setStDate(requestDto.getStDate()); + params.setEdDate(requestDto.getEdDate()); + params.setWon(requestDto.getWon()); + List statsList = budgetMapper.selectStatDetailList(params); + Double wonUnit = params.getWon().doubleValue(); + for(StatsDetailResult stat : statsList){ + stat.setPlanAmount(stat.getPlanAmount()/wonUnit); + stat.setAssignAmount(stat.getAssignAmount()/wonUnit); + stat.setExpenseAmount(stat.getExpenseAmount()/wonUnit); + stat.setBalanceAmount(stat.getAssignAmount()-stat.getExpenseAmount()); + stat.setRate((double)Math.round(stat.getExpenseAmount()/stat.getAssignAmount()*10000)/100); + } + return statsList; + } + + public List selectSpGetL3Code(UserInfo loginUser, Integer year){ // return budgetRepository.callSpGetBudgetCodeL3(year); BudgetParams params = new BudgetParams(); - params.setYear(year); + params.setYear(year.toString()); return budgetMapper.callSpGetBudgetCodeL3(params); } diff --git a/src/main/resources/mybatisMapper/BudgetMapper.xml b/src/main/resources/mybatisMapper/BudgetMapper.xml index 6c5445ff..4ce4226f 100644 --- a/src/main/resources/mybatisMapper/BudgetMapper.xml +++ b/src/main/resources/mybatisMapper/BudgetMapper.xml @@ -77,6 +77,7 @@ + + @@ -187,4 +189,45 @@ order by order_seq, organ_cd, budget_code ) a + + \ No newline at end of file diff --git a/src/main/resources/static/js/budget/statsDetail.js b/src/main/resources/static/js/budget/statsDetail.js index d88c89e0..32eb0d3b 100644 --- a/src/main/resources/static/js/budget/statsDetail.js +++ b/src/main/resources/static/js/budget/statsDetail.js @@ -45,7 +45,7 @@ function statsSearch () { contentFade("in"); //location.href="/budget/stats/detail?year="+$("#year").val() + "&stDate=" + $("#stDate").val() + "&edDate=" + $("#edDate").val() + "&code=" +$("#code").val() + "&won="+$("#won").val(); - location.href="/budget/stats/detail?year="+$("#year").val() + "&stDate=" + $("#stDate").val() + "&edDate=" + $("#edDate").val() + "&code=본청&won="+$("#won").val()+"&item="+$("#item").val(); + location.href="/budget/stats/detail?year="+$("#year").val() + "&stDate=" + $("#stDate").val() + "&edDate=" + $("#edDate").val() + "&code="+$("#code").val()+"&won="+$("#won").val()+"&item="+$("#item").val(); } $(document).on('click', '#deleteBtn', function (){ diff --git a/src/main/resources/templates/budget/assign.html b/src/main/resources/templates/budget/assign.html index 54f22478..53272ecb 100644 --- a/src/main/resources/templates/budget/assign.html +++ b/src/main/resources/templates/budget/assign.html @@ -37,7 +37,6 @@
- @@ -74,14 +73,14 @@ 예산총액 예산총배정액
(누적) 집행액(총계) - + 지출총액 보유잔액 - + 배정액 지출총액 잔액 @@ -101,7 +100,7 @@ - + diff --git a/src/main/resources/templates/budget/statsDetail.html b/src/main/resources/templates/budget/statsDetail.html index a3833d46..540403a0 100644 --- a/src/main/resources/templates/budget/statsDetail.html +++ b/src/main/resources/templates/budget/statsDetail.html @@ -45,18 +45,30 @@
+ + + + + +
@@ -84,7 +96,7 @@ 재무관서 - 예산총액 + 예산배정액
(누적) 집행액(총계) @@ -97,12 +109,16 @@ - - - - - - + + + + + + + + + + diff --git a/src/main/resources/templates/budget/statsOrg.html b/src/main/resources/templates/budget/statsOrg.html index 7a14cebc..9f5e6913 100644 --- a/src/main/resources/templates/budget/statsOrg.html +++ b/src/main/resources/templates/budget/statsOrg.html @@ -51,17 +51,23 @@
- + + + + + +
@@ -77,23 +83,27 @@
-
- +
+
+ + - + + + - + @@ -109,56 +119,58 @@ - + + - + + - + - + - + - + - + - + - + - +
사업명 구분 세부내역예산총액 예산총배정액
(누적)		집행액(총계)
지출총액 보유잔액 진행률배정액 지출총액 잔액 11