From 02781efdeb9c30cd5d921e40292c72be557830ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= Date: Wed, 19 Jul 2023 18:13:27 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=88=EC=82=B0=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/config/BaseController.java | 2 - .../faisp/main/budget/BudgetController.java | 3 +- .../main/budget/mapper/BudgetMapper.java | 35 ++ .../faisp/main/budget/model/AssignResult.java | 33 ++ .../faisp/main/budget/model/BudgetParams.java | 40 +++ .../main/budget/model/BudgetingList.java | 15 + .../faisp/main/budget/model/CodeResult.java | 10 + .../main/budget/model/ExpenseInfoResult.java | 13 + .../main/budget/model/ExpenseResult.java | 63 ++++ .../faisp/main/budget/model/L3CodeResult.java | 10 + .../main/budget/model/StatsItemResult.java | 13 + .../faisp/main/budget/model/UpdateResult.java | 10 + .../faisp/main/budget/model/YearResult.java | 8 + .../budget/repository/BudgetRepository.java | 145 +------- .../main/budget/service/BudgetService.java | 340 ++++++++++++------ .../resources/mybatisMapper/BudgetMapper.xml | 90 +++++ src/main/resources/static/js/budget/assign.js | 4 +- .../resources/templates/budget/assign.html | 42 +-- .../templates/budget/assignEditModal.html | 74 ++-- .../resources/templates/budget/expense.html | 84 ++--- .../templates/budget/expenseEditModal.html | 10 +- .../templates/budget/statsDetail.html | 14 +- .../resources/templates/budget/statsOrg.html | 78 ++-- 23 files changed, 729 insertions(+), 407 deletions(-) create mode 100644 src/main/java/com/dbnt/faisp/main/budget/mapper/BudgetMapper.java create mode 100644 src/main/java/com/dbnt/faisp/main/budget/model/AssignResult.java create mode 100644 src/main/java/com/dbnt/faisp/main/budget/model/BudgetParams.java create mode 100644 src/main/java/com/dbnt/faisp/main/budget/model/BudgetingList.java create mode 100644 src/main/java/com/dbnt/faisp/main/budget/model/CodeResult.java create mode 100644 src/main/java/com/dbnt/faisp/main/budget/model/ExpenseInfoResult.java create mode 100644 src/main/java/com/dbnt/faisp/main/budget/model/ExpenseResult.java create mode 100644 src/main/java/com/dbnt/faisp/main/budget/model/L3CodeResult.java create mode 100644 src/main/java/com/dbnt/faisp/main/budget/model/StatsItemResult.java create mode 100644 src/main/java/com/dbnt/faisp/main/budget/model/UpdateResult.java create mode 100644 src/main/java/com/dbnt/faisp/main/budget/model/YearResult.java create mode 100644 src/main/resources/mybatisMapper/BudgetMapper.xml diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index 7928765e..be37793f 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -6,7 +6,6 @@ import com.dbnt.faisp.main.faRpt.model.FaRptBoard; import com.dbnt.faisp.main.faRpt.model.Sri; import com.dbnt.faisp.main.faRpt.service.FaRptService; import com.dbnt.faisp.main.faRpt.service.SriService; -import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; import com.dbnt.faisp.main.fpiMgt.affair.model.DashboardAffair; import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService; import com.dbnt.faisp.main.menuMgt.service.MenuMgtService; @@ -18,7 +17,6 @@ import com.dbnt.faisp.main.userInfo.model.UserInfo; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.userInfo.service.UserAlarmService; -import com.dbnt.faisp.main.userInfo.service.UserInfoService; import com.dbnt.faisp.main.userInfo.service.UserLogService; import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; 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 044999e1..ff2a7cc7 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java +++ b/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java @@ -1,8 +1,7 @@ package com.dbnt.faisp.main.budget; import com.dbnt.faisp.main.budget.common.ResultResponseCode; -import com.dbnt.faisp.main.budget.model.ResultResponse; -import com.dbnt.faisp.main.budget.model.BudgetDto; +import com.dbnt.faisp.main.budget.model.*; import com.dbnt.faisp.main.budget.repository.BudgetRepository.*; import com.dbnt.faisp.main.budget.service.BudgetService; import com.dbnt.faisp.main.userInfo.model.UserInfo; 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 new file mode 100644 index 00000000..6d3c3f4d --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/mapper/BudgetMapper.java @@ -0,0 +1,35 @@ +package com.dbnt.faisp.main.budget.mapper; + +import com.dbnt.faisp.main.authMgt.model.AccessConfig; +import com.dbnt.faisp.main.authMgt.model.ApprovalConfig; +import com.dbnt.faisp.main.budget.model.*; +import com.dbnt.faisp.main.budget.repository.BudgetRepository; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +@Mapper +public interface BudgetMapper { + List callSpGetBudgetPlanInfo(BudgetParams param); + List callSpGetBudgetCodeYearList(); + UpdateResult callSpCopyBudgetItem(BudgetParams param); + UpdateResult callBruteForceDeleteBudgetItem(BudgetParams param); + UpdateResult callSpAddBudgetPlanCodeName(BudgetParams param); + UpdateResult callSpUpdateBudgetPlanCodeName(BudgetParams param); + UpdateResult callSpDeleteBudgetPlanCodeName(BudgetParams param); + UpdateResult callSpUpdateBudgetPlanCodeItem(BudgetParams param); + UpdateResult callSpDeleteBudgetPlan(BudgetParams param); + List callSpGetBudgetAssignInfo(BudgetParams param); + List callSpGetDownOrg(BudgetParams param); + List callSpGetLowerOrgCodeByName(); + String callSpGetHighOrgCode(BudgetParams params); + UpdateResult callSpAddBudgetAssign(BudgetParams params); + List callSpGetBudgetExpenseInfo(BudgetParams params); + List callSpGetBudgetExpense(BudgetParams params); + UpdateResult callSpAddBudgetExpense(BudgetParams params); + List callSpUpdateBudgetExpense(BudgetParams params); + List callSpGetbudgetStatOrg(BudgetParams params); + List callSpGetbudgetStatDetail(BudgetParams params); + List callSpGetBudgetCodeL3(BudgetParams params); +} diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/AssignResult.java b/src/main/java/com/dbnt/faisp/main/budget/model/AssignResult.java new file mode 100644 index 00000000..e0ccd426 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/model/AssignResult.java @@ -0,0 +1,33 @@ +package com.dbnt.faisp.main.budget.model; + +import lombok.Getter; + +@Getter +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; + +} 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 new file mode 100644 index 00000000..531f5250 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/model/BudgetParams.java @@ -0,0 +1,40 @@ +package com.dbnt.faisp.main.budget.model; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.util.Date; + +@Getter +@Setter +@NoArgsConstructor +public class BudgetParams { + private String code; + private String code1; + private String code2; + private String code3; + + private String year; + private String copyYear; + private String org; + private String org1; + private String user; + private String id; + private String item; + private Integer won; + + private String newCode1; + private String newCode2; + private String newCode3; + + private String nameL1; + private String nameL2; + private String nameL3; + + private Integer amount; + private String dt; + + private Date stDate; + private Date edDate; +} diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/BudgetingList.java b/src/main/java/com/dbnt/faisp/main/budget/model/BudgetingList.java new file mode 100644 index 00000000..53738890 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/model/BudgetingList.java @@ -0,0 +1,15 @@ +package com.dbnt.faisp.main.budget.model; + +import lombok.Getter; + +@Getter +public class BudgetingList { + String budgetNameL1; + String budgetNameL2; + String budgetNameL3; + String budgetCodeL3; + Integer amount; + String remark; + String modiId; + String modiDate; +} diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/CodeResult.java b/src/main/java/com/dbnt/faisp/main/budget/model/CodeResult.java new file mode 100644 index 00000000..15285cfd --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/model/CodeResult.java @@ -0,0 +1,10 @@ +package com.dbnt.faisp.main.budget.model; + +import lombok.Getter; + +@Getter +public class CodeResult { + String orgName; + String orgCode; + +} diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/ExpenseInfoResult.java b/src/main/java/com/dbnt/faisp/main/budget/model/ExpenseInfoResult.java new file mode 100644 index 00000000..7acbef36 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/model/ExpenseInfoResult.java @@ -0,0 +1,13 @@ +package com.dbnt.faisp.main.budget.model; + +import lombok.Getter; + +@Getter +public class ExpenseInfoResult { + String seq; + String expenseDate; + String expenseItem; + String amount; + String modiId; + String modiDate; +} diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/ExpenseResult.java b/src/main/java/com/dbnt/faisp/main/budget/model/ExpenseResult.java new file mode 100644 index 00000000..ac658af0 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/model/ExpenseResult.java @@ -0,0 +1,63 @@ +package com.dbnt.faisp.main.budget.model; + +import lombok.Getter; + +@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; + + String periodAssignAmount2; + String expensePAmount2; + String blanceAmount2; + String expenseRate2; + + String periodAssignAmount3; + String expensePAmount3; + String blanceAmount3; + String expenseRate3; + + + String periodAssignAmount4; + String expensePAmount4; + String blanceAmount4; + String expenseRate4; + + + String periodAssignAmount5; + String expensePAmount5; + String blanceAmount5; + String expenseRate5; + + + String periodAssignAmount6; + String expensePAmount6; + String blanceAmount6; + String expenseRate6; + + String periodAssignAmount7; + String expensePAmount7; + String blanceAmount7; + String expenseRate7; + + String periodAssignAmount8; + String expensePAmount8; + String blanceAmount8; + String expenseRate8; + + String periodAssignAmount9; + String expensePAmount9; + String blanceAmount9; + String expenseRate9; +} diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/L3CodeResult.java b/src/main/java/com/dbnt/faisp/main/budget/model/L3CodeResult.java new file mode 100644 index 00000000..e31e5dee --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/model/L3CodeResult.java @@ -0,0 +1,10 @@ +package com.dbnt.faisp.main.budget.model; + +import lombok.Getter; + +@Getter +public class L3CodeResult { + + String l3Name; + String l3Code; +} diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/StatsItemResult.java b/src/main/java/com/dbnt/faisp/main/budget/model/StatsItemResult.java new file mode 100644 index 00000000..478ec471 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/model/StatsItemResult.java @@ -0,0 +1,13 @@ +package com.dbnt.faisp.main.budget.model; + +import lombok.Getter; + +@Getter +public class StatsItemResult { + String orgName; + String planAmount; + String totalAssignAmount; + String expenseTAmount; + String balanceTAmount; + String expenseTotalRate; +} diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/UpdateResult.java b/src/main/java/com/dbnt/faisp/main/budget/model/UpdateResult.java new file mode 100644 index 00000000..262a7ebf --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/model/UpdateResult.java @@ -0,0 +1,10 @@ +package com.dbnt.faisp.main.budget.model; + +import lombok.Getter; + +@Getter +public class UpdateResult { + Integer resultCount; + String resultCode; + String errorMessage; +} diff --git a/src/main/java/com/dbnt/faisp/main/budget/model/YearResult.java b/src/main/java/com/dbnt/faisp/main/budget/model/YearResult.java new file mode 100644 index 00000000..f66d316b --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/budget/model/YearResult.java @@ -0,0 +1,8 @@ +package com.dbnt.faisp.main.budget.model; + +import lombok.Getter; + +@Getter +public class YearResult { + String year; +} diff --git a/src/main/java/com/dbnt/faisp/main/budget/repository/BudgetRepository.java b/src/main/java/com/dbnt/faisp/main/budget/repository/BudgetRepository.java index cbc3b0e9..86030718 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/repository/BudgetRepository.java +++ b/src/main/java/com/dbnt/faisp/main/budget/repository/BudgetRepository.java @@ -1,5 +1,6 @@ package com.dbnt.faisp.main.budget.repository; +import com.dbnt.faisp.main.budget.model.*; import com.dbnt.faisp.main.codeMgt.model.CodeCatg; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -197,150 +198,6 @@ public interface BudgetRepository extends JpaRepository { @Param("year") String year ); - public static interface BudgetingList { - String getBudgetNameL1(); - String getBudgetNameL2(); - String getBudgetNameL3(); - String getBudgetCodeL3(); - Integer getAmount(); - String getRemark(); - String getModiId(); - String getModiDate(); - } - - public static interface UpdateResult { - Integer get_result_count(); - String get_result_code(); - String get_error_message(); - - } - - public static interface YearResult { - String getYear(); - } - - public static interface AssignResult { - String getorg_count(); - String getbudget_name_l1(); - String getbudget_name_l2(); - String getbudget_name_l3(); - String getbudget_code_l3(); - String getplan_amount(); - String gettotal_assign_amount(); - String getperiod_assign_amount1(); - String getsum_assign_amount1(); - String getperiod_assign_amount2(); - String getsum_assign_amount2(); - String getperiod_assign_amount3(); - String getsum_assign_amount3(); - String getperiod_assign_amount4(); - String getsum_assign_amount4(); - String getperiod_assign_amount5(); - String getsum_assign_amount5(); - String getperiod_assign_amount6(); - String getsum_assign_amount6(); - String getperiod_assign_amount7(); - String getsum_assign_amount7(); - String getperiod_assign_amount8(); - String getsum_assign_amount8(); - String getperiod_assign_amount9(); - String getsum_assign_amount9(); - - } - - public static interface L3CodeResult { - - String getl3_name(); - String getl3_code(); - - } - - public static interface StatsItemResult { - String getorg_name(); - String getplan_amount(); - String gettotal_assign_amount(); - String getexpense_t_amount(); - String getbalance_t_amount(); - String getexpense_total_rate(); - } - - public static interface ExpenseResult { - String getorg_count(); - String getbudget_name_l1(); - String getbudget_name_l2(); - String getbudget_name_l3(); - String getbudget_code_l3(); - String getplan_amount(); - String gettotal_assign_amount(); - String getexpense_t_amount(); - String getbalance_t_amount(); - Integer getperiod_assign_amount1(); - Integer getexpense_p_amount1(); - Integer getblance_amount1(); - Integer getexpense_rate1(); - - String getperiod_assign_amount2(); - String getexpense_p_amount2(); - String getblance_amount2(); - String getexpense_rate2(); - - String getperiod_assign_amount3(); - String getexpense_p_amount3(); - String getblance_amount3(); - String getexpense_rate3(); - - - String getperiod_assign_amount4(); - String getexpense_p_amount4(); - String getblance_amount4(); - String getexpense_rate4(); - - - String getperiod_assign_amount5(); - String getexpense_p_amount5(); - String getblance_amount5(); - String getexpense_rate5(); - - - String getperiod_assign_amount6(); - String getexpense_p_amount6(); - String getblance_amount6(); - String getexpense_rate6(); - - String getperiod_assign_amount7(); - String getexpense_p_amount7(); - String getblance_amount7(); - String getexpense_rate7(); - - String getperiod_assign_amount8(); - String getexpense_p_amount8(); - String getblance_amount8(); - String getexpense_rate8(); - - String getperiod_assign_amount9(); - String getexpense_p_amount9(); - String getblance_amount9(); - String getexpense_rate9(); - - - } - - public static interface ExpenseInfoResult { - String getseq(); - String getexpense_date(); - String getexpense_item(); - String getamount(); - String getmodi_id(); - String getmodi_date(); - } - - - public static interface CodeResult { - String getOrgName(); - String getOrgCode(); - - - } } 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 166eb599..d1647af1 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 @@ -3,7 +3,8 @@ package com.dbnt.faisp.main.budget.service; import com.dbnt.faisp.main.budget.common.BaseException; import com.dbnt.faisp.main.budget.common.ResultResponseCode; -import com.dbnt.faisp.main.budget.model.BudgetDto; +import com.dbnt.faisp.main.budget.mapper.BudgetMapper; +import com.dbnt.faisp.main.budget.model.*; import com.dbnt.faisp.main.budget.repository.BudgetRepository; import com.dbnt.faisp.main.budget.repository.BudgetRepository.*; import com.dbnt.faisp.main.equip.model.Equip; @@ -14,6 +15,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.time.format.DateTimeFormatter; import java.util.*; @@ -23,13 +25,21 @@ import java.util.*; public class BudgetService { private final BudgetRepository budgetRepository; + private final BudgetMapper budgetMapper; public List selectBudgetingList(UserInfo loginUser, BudgetDto.BudgetingSearchReqeust requestDto){ - return budgetRepository.callSpGetBudgetPlanInfo(requestDto.getYear(), "OG001", "admin"); + + /*return budgetRepository.callSpGetBudgetPlanInfo(requestDto.getYear(), "OG001", "admin");*/ + BudgetParams param = new BudgetParams(); + param.setCode1(requestDto.getYear()); + param.setCode2("OG001"); + param.setCode3("admin"); + return budgetMapper.callSpGetBudgetPlanInfo(param); } public List selectBudgetingYearList(UserInfo loginUser){ - return budgetRepository.callSpGetBudgetCodeYearList(); +// return budgetRepository.callSpGetBudgetCodeYearList(); + return budgetMapper.callSpGetBudgetCodeYearList(); } // 예산편성 - 연도추가(버튼) @@ -37,14 +47,19 @@ public class BudgetService { public void copyYearBudgeting(UserInfo loginUser, BudgetDto.BudgetingCopyReqeust requestDto){ // System.out.println(requestDto.getYear()); // System.out.println(requestDto.getCopyYear()); - UpdateResult result = budgetRepository.callSpCopyBudgetItem(requestDto.getYear(), requestDto.getCopyYear(), loginUser.getUserId()); +// UpdateResult result = budgetRepository.callSpCopyBudgetItem(requestDto.getYear(), requestDto.getCopyYear(), loginUser.getUserId()); + BudgetParams params = new BudgetParams(); + params.setYear(requestDto.getYear()); + params.setCopyYear(requestDto.getCopyYear()); + params.setId(loginUser.getUserId()); + UpdateResult result = budgetMapper.callSpCopyBudgetItem(params); - if(result.get_result_code().equals("100")) { + if(result.getResultCode().equals("100")) { return; } else { - System.out.println(result.get_error_message()); - System.out.println(result.get_result_code()); - System.out.println(result.get_result_count()); +// System.out.println(result.getErrorMessage()); +// System.out.println(result.getResultCode()); +// System.out.println(result.getResultCount()); throw new BaseException(ResultResponseCode.FOUND_YEAR); } @@ -55,19 +70,23 @@ public class BudgetService { public void deleteBudgetingYear(UserInfo loginUser, BudgetDto.BudgetingCopyReqeust requestDto){ // System.out.println(requestDto.getYear()); // System.out.println(requestDto.getCopyYear()); - UpdateResult result = budgetRepository.callBruteForceDeleteBudgetItem(requestDto.getYear(), "admin"); +// UpdateResult result = budgetRepository.callBruteForceDeleteBudgetItem(requestDto.getYear(), "admin"); + BudgetParams params = new BudgetParams(); + params.setYear(requestDto.getYear()); + params.setId("admin"); + UpdateResult result = budgetMapper.callBruteForceDeleteBudgetItem(params); - if(result.get_result_code().equals("100")) { + if(result.getResultCode().equals("100")) { return; - }else if( result.get_result_code().equals("93")){ - System.out.println(result.get_error_message()); - System.out.println(result.get_result_code()); - System.out.println(result.get_result_count()); + }else if( result.getResultCode().equals("93")){ +// System.out.println(result.getErrorMessage()); +// System.out.println(result.getResultCode()); +// System.out.println(result.getResultCount()); throw new BaseException(ResultResponseCode.NOT_FOUND_YEAR); } else { - System.out.println(result.get_error_message()); - System.out.println(result.get_result_code()); - System.out.println(result.get_result_count()); +// System.out.println(result.getErrorMessage()); +// System.out.println(result.getResultCode()); +// System.out.println(result.getResultCount()); throw new BaseException(ResultResponseCode.DELETE_FOUND_VALUE); } } @@ -75,16 +94,23 @@ public class BudgetService { //예산편성 - 항목추가 @Transactional public void insertBudgetingList(UserInfo loginUser, BudgetDto.BudgetingInsertReqeust requestDto){ - System.out.println(requestDto.getYear()); - System.out.println(requestDto.getNameL1()); - System.out.println(requestDto.getNameL2()); - System.out.println(requestDto.getNameL3()); - UpdateResult result = budgetRepository.callSpAddBudgetPlanCodeName(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin"); - - System.out.println(result.get_error_message()); - System.out.println(result.get_result_code()); - System.out.println(result.get_result_count()); - if(result.get_result_code().equals("100")) { +// System.out.println(requestDto.getYear()); +// System.out.println(requestDto.getNameL1()); +// System.out.println(requestDto.getNameL2()); +// System.out.println(requestDto.getNameL3()); +// UpdateResult result = budgetRepository.callSpAddBudgetPlanCodeName(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin"); + BudgetParams params = new BudgetParams(); + params.setYear(requestDto.getYear()); + params.setCode1(requestDto.getNameL1()); + params.setCode2(requestDto.getNameL2()); + params.setCode3(requestDto.getNameL3()); + params.setOrg("OG001"); + params.setId("admin"); + UpdateResult result = budgetMapper.callSpAddBudgetPlanCodeName(params); +// System.out.println(result.getErrorMessage()); +// System.out.println(result.getResultCode()); +// System.out.println(result.getResultCount()); + if(result.getResultCode().equals("100")) { return; } else { throw new BaseException(ResultResponseCode.DUPLICATE_CODE); @@ -94,31 +120,50 @@ public class BudgetService { //예산편성 - 항목변경 public void updateBudgetingList(UserInfo loginUser, BudgetDto.BudgetingUpdateReqeust requestDto){ - System.out.println(requestDto.getYear()+","+ requestDto.getPrevNameL1()+","+requestDto.getPrevNameL2()+","+requestDto.getPrevNameL3()+","+requestDto.getNameL1()+","+requestDto.getNameL2()+","+requestDto.getNameL3()); - UpdateResult result = budgetRepository.callSpUpdateBudgetPlanCodeName( requestDto.getYear(), requestDto.getPrevNameL1(), requestDto.getPrevNameL2(), requestDto.getPrevNameL3(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin"); - System.out.println(result.get_error_message()); - System.out.println(result.get_result_code()); - System.out.println(result.get_result_count()); - System.out.println(result); - if(result.get_result_code().equals("100")) { +// System.out.println(requestDto.getYear()+","+ requestDto.getPrevNameL1()+","+requestDto.getPrevNameL2()+","+requestDto.getPrevNameL3()+","+requestDto.getNameL1()+","+requestDto.getNameL2()+","+requestDto.getNameL3()); +// UpdateResult result = budgetRepository.callSpUpdateBudgetPlanCodeName( requestDto.getYear(), requestDto.getPrevNameL1(), requestDto.getPrevNameL2(), requestDto.getPrevNameL3(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin"); + BudgetParams params = new BudgetParams(); + params.setYear(requestDto.getYear()); + params.setCode1(requestDto.getNameL1()); + params.setCode2(requestDto.getNameL2()); + params.setCode3(requestDto.getNameL3()); + params.setNewCode1(requestDto.getPrevNameL1()); + params.setNewCode2(requestDto.getPrevNameL2()); + params.setNewCode3(requestDto.getPrevNameL3()); + params.setOrg("OG001"); + params.setId("admin"); + UpdateResult result = budgetMapper.callSpUpdateBudgetPlanCodeName(params); +// System.out.println(result.getErrorMessage()); +// System.out.println(result.getResultCode()); +// System.out.println(result.getResultCount()); +// System.out.println(result); + if(result.getResultCode().equals("100")) { return; - } else if (result.get_result_code().equals("91")) { + } else if (result.getResultCode().equals("91")) { throw new BaseException(ResultResponseCode.DUPLICATE_CODE); } } //예산편성 - 항목삭제 public void deleteBudgetingList(UserInfo loginUser, BudgetDto.BudgetingInsertReqeust requestDto){ - System.out.println(requestDto.getYear()); - System.out.println(requestDto.getNameL1()); - System.out.println(requestDto.getNameL2()); - System.out.println(requestDto.getNameL3()); - UpdateResult result = budgetRepository.callSpDeleteBudgetPlanCodeName(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin"); +// System.out.println(requestDto.getYear()); +// System.out.println(requestDto.getNameL1()); +// System.out.println(requestDto.getNameL2()); +// System.out.println(requestDto.getNameL3()); +// UpdateResult result = budgetRepository.callSpDeleteBudgetPlanCodeName(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin"); + BudgetParams params = new BudgetParams(); + params.setYear(requestDto.getYear()); + params.setCode1(requestDto.getNameL1()); + params.setCode2(requestDto.getNameL2()); + params.setCode3(requestDto.getNameL3()); + params.setOrg("OG001"); + params.setId("admin"); + UpdateResult result = budgetMapper.callSpDeleteBudgetPlanCodeName(params); - System.out.println(result.get_error_message()); - System.out.println(result.get_result_code()); - System.out.println(result.get_result_count()); - if(result.get_result_code().equals("100")) { +// System.out.println(result.getErrorMessage()); +// System.out.println(result.getResultCode()); +// System.out.println(result.getResultCount()); + if(result.getResultCode().equals("100")) { return; } else { throw new BaseException(ResultResponseCode.DELETE_FOUND_VALUE); @@ -132,17 +177,26 @@ public class BudgetService { // System.out.println(requestDto.getNameL1()); // System.out.println(requestDto.getNameL2()); // System.out.println(requestDto.getNameL3()); - UpdateResult result = budgetRepository.callSpUpdateBudgetPlanCodeItem(requestDto.getYear(), requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), requestDto.getAmount(),"OG001", "admin"); +// UpdateResult result = budgetRepository.callSpUpdateBudgetPlanCodeItem(requestDto.getYear(), requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), requestDto.getAmount(),"OG001", "admin"); + BudgetParams params = new BudgetParams(); + params.setYear(requestDto.getYear()); + params.setCode1(requestDto.getNameL1()); + params.setCode2(requestDto.getNameL2()); + params.setCode3(requestDto.getNameL3()); + params.setAmount(requestDto.getAmount()); + params.setOrg("OG001"); + params.setId("admin"); + UpdateResult result = budgetMapper.callSpUpdateBudgetPlanCodeItem(params); -// System.out.println(result.get_error_message()); -// System.out.println(result.get_result_code()); -// System.out.println(result.get_result_count()); - if(result.get_result_code().equals("100")) { +// System.out.println(result.getErrorMessage()); +// System.out.println(result.getResultCode()); +// System.out.println(result.getResultCount()); + if(result.getResultCode().equals("100")) { return; } else { - System.out.println(result.get_error_message()); - System.out.println(result.get_result_code()); - System.out.println(result.get_result_count()); +// System.out.println(result.getErrorMessage()); +// System.out.println(result.getResultCode()); +// System.out.println(result.getResultCount()); throw new BaseException(ResultResponseCode.DUPLICATE_CODE); } @@ -155,15 +209,19 @@ public class BudgetService { // System.out.println(requestDto.getNameL1()); // System.out.println(requestDto.getNameL2()); // System.out.println(requestDto.getNameL3()); - UpdateResult result = budgetRepository.callSpDeleteBudgetPlan(requestDto.getYear(), "OG001", "admin"); +// UpdateResult result = budgetRepository.callSpDeleteBudgetPlan(requestDto.getYear(), "OG001", "admin"); + BudgetParams params = new BudgetParams(); + params.setYear(requestDto.getYear()); + params.setOrg("OG001"); + params.setId("admin"); + UpdateResult result = budgetMapper.callSpDeleteBudgetPlan(params); - - if(result.get_result_code().equals("100")) { + if(result.getResultCode().equals("100")) { return; } else { - System.out.println(result.get_error_message()); - System.out.println(result.get_result_code()); - System.out.println(result.get_result_count()); +// System.out.println(result.getErrorMessage()); +// System.out.println(result.getResultCode()); +// System.out.println(result.getResultCount()); throw new BaseException(ResultResponseCode.NOT_FOUND_CODE); } @@ -175,48 +233,70 @@ public class BudgetService { // System.out.println(requestDto.getYear()); // System.out.println(requestDto.getStDate()); // System.out.println(requestDto.getEdDate()); - return budgetRepository.callSpGetBudgetAssignInfo(requestDto.getYear(), requestDto.getCode(), "admin", java.sql.Date.valueOf(requestDto.getStDate()),java.sql.Date.valueOf(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()); + params.setUser("admin"); + params.setStDate(java.sql.Date.valueOf(requestDto.getStDate())); + params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate())); + return budgetMapper.callSpGetBudgetAssignInfo(params); } //(공통) 2단계로 하위청 뿌려주기 public List selectDownOrg(String userOrgCode){ - return budgetRepository.callSpGetDownOrg(userOrgCode); +// return budgetRepository.callSpGetDownOrg(userOrgCode); + BudgetParams params = new BudgetParams(); + params.setOrg(userOrgCode); + return budgetMapper.callSpGetDownOrg(params); } // public List selectGetLowerOrgCodeByName(UserInfo loginUser){ - return budgetRepository.callSpGetLowerOrgCodeByName(); +// return budgetRepository.callSpGetLowerOrgCodeByName(); + return budgetMapper.callSpGetLowerOrgCodeByName(); } //상위 기관 코드 가져오기 (3단계인경우만) public String selectGetHighOrgCode(String userOrgCode){ - return budgetRepository.callSpGetHighOrgCode(userOrgCode); +// return budgetRepository.callSpGetHighOrgCode(userOrgCode); + BudgetParams params = new BudgetParams(); + params.setOrg(userOrgCode); + return budgetMapper.callSpGetHighOrgCode(params); } // 예산배정 - 등록(저장버튼) @Transactional public void updateAssignList(UserInfo loginUser, BudgetDto.AssignSaveReqeust requestDto){ - System.out.println(requestDto.getCode()); - System.out.println(requestDto.getOrg()); - System.out.println(requestDto.getYear()); +// System.out.println(requestDto.getCode()); +// System.out.println(requestDto.getOrg()); +// System.out.println(requestDto.getYear()); // System.out.println(requestDto.getAmount()); - UpdateResult result = budgetRepository.callSpAddBudgetAssign(requestDto.getCode(),requestDto.getOrg(),requestDto.getOrg1(), requestDto.getAmount(), "2023-03-15"); +// UpdateResult result = budgetRepository.callSpAddBudgetAssign(requestDto.getCode(),requestDto.getOrg(),requestDto.getOrg1(), requestDto.getAmount(), "2023-03-15"); + BudgetParams params = new BudgetParams(); + params.setCode(requestDto.getCode()); + params.setOrg(requestDto.getOrg()); + params.setOrg1(requestDto.getOrg1()); + params.setAmount(requestDto.getAmount()); + params.setDt("2023-03-15"); + UpdateResult result = budgetMapper.callSpAddBudgetAssign(params); - System.out.println(result.get_error_message()); - System.out.println(result.get_result_code()); - System.out.println(result.get_result_count()); - if(result.get_result_code().equals("100")) { +// System.out.println(result.getErrorMessage()); +// System.out.println(result.getResultCode()); +// System.out.println(result.getResultCount()); + if(result.getResultCode().equals("100")) { return; - }else if(result.get_result_code().equals("72")) { - System.out.println(result.get_error_message()); - System.out.println(result.get_result_code()); - System.out.println(result.get_result_count()); + }else if(result.getResultCode().equals("72")) { +// System.out.println(result.getErrorMessage()); +// System.out.println(result.getResultCode()); +// System.out.println(result.getResultCount()); throw new BaseException(ResultResponseCode.EXPENSE_OVER_VALUE); } else { - System.out.println(result.get_error_message()); - System.out.println(result.get_result_code()); - System.out.println(result.get_result_count()); +// System.out.println(result.getErrorMessage()); +// System.out.println(result.getResultCode()); +// System.out.println(result.getResultCount()); throw new BaseException(ResultResponseCode.DUPLICATE_CODE); } @@ -224,19 +304,33 @@ 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())); +// 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.setCode(requestDto.getCode()); + params.setUser("admin"); + params.setStDate(java.sql.Date.valueOf(requestDto.getStDate())); + params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate())); + return budgetMapper.callSpGetBudgetExpenseInfo(params); } 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(), "본청"); +// 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("본청"); + return budgetMapper.callSpGetBudgetExpense(params); } @Transactional @@ -245,14 +339,25 @@ public class BudgetService { // 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())); +// UpdateResult result = budgetRepository.callSpAddBudgetExpense(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "본청", requestDto.getItem(), requestDto.getAmount(), java.sql.Date.valueOf(requestDto.getExpenseDate())); - System.out.println(result.get_error_message()); - System.out.println(result.get_result_code()); - System.out.println(result.get_result_count()); - if(result.get_result_code().equals("100")) { + BudgetParams params = new BudgetParams(); + params.setYear(requestDto.getYear()); + params.setCode1(requestDto.getNameL1()); + params.setCode2(requestDto.getNameL2()); + params.setCode3(requestDto.getNameL3()); + params.setOrg("본청"); + 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; - }else if(result.get_result_code().equals("71")) { + }else if(result.getResultCode().equals("71")) { throw new BaseException(ResultResponseCode.EXPENSE_OVER_VALUE); } else { throw new BaseException(ResultResponseCode.ERROR); @@ -261,26 +366,49 @@ public class BudgetService { } public List selectSpGetbudgetStatOrg(UserInfo loginUser,BudgetDto.StatsSearchReqeust 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()); - System.out.println(requestDto.getWon()); - return budgetRepository.callSpGetbudgetStatOrg(requestDto.getYear(), requestDto.getCode(), "admin", java.sql.Date.valueOf(requestDto.getStDate()), java.sql.Date.valueOf(requestDto.getEdDate()), requestDto.getWon()); +// System.out.println(requestDto.getYear()); +// System.out.println(requestDto.getCode()); +// System.out.println(java.sql.Date.valueOf(requestDto.getStDate())); +// System.out.println(requestDto.getEdDate()); +// System.out.println(requestDto.getWon()); +// 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.setCode(requestDto.getCode()); + params.setUser("admin"); + params.setStDate(java.sql.Date.valueOf(requestDto.getStDate())); + params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate())); + params.setWon(requestDto.getWon()); + return budgetMapper.callSpGetbudgetStatOrg(params); } public List selectSpGetbudgetStatDetail(UserInfo loginUser,BudgetDto.StatsSearchReqeust 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()); - System.out.println(requestDto.getWon()); - return budgetRepository.callSpGetbudgetStatDetail(requestDto.getYear(), requestDto.getCode(), requestDto.getItem(), "admin", java.sql.Date.valueOf(requestDto.getStDate()), java.sql.Date.valueOf(requestDto.getEdDate()), requestDto.getWon()); +// System.out.println(requestDto.getYear()); +// System.out.println(requestDto.getCode()); +// System.out.println(java.sql.Date.valueOf(requestDto.getStDate())); +// System.out.println(requestDto.getEdDate()); +// System.out.println(requestDto.getWon()); +// 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.setCode(requestDto.getCode()); + params.setItem(requestDto.getItem()); + params.setUser("admin"); + params.setStDate(java.sql.Date.valueOf(requestDto.getStDate())); + params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate())); + params.setWon(requestDto.getWon()); + return budgetMapper.callSpGetbudgetStatDetail(params); } public List selectSpGetL3Code(UserInfo loginUser,String year){ - return budgetRepository.callSpGetBudgetCodeL3(year); +// return budgetRepository.callSpGetBudgetCodeL3(year); + + BudgetParams params = new BudgetParams(); + params.setYear(year); + return budgetMapper.callSpGetBudgetCodeL3(params); } diff --git a/src/main/resources/mybatisMapper/BudgetMapper.xml b/src/main/resources/mybatisMapper/BudgetMapper.xml new file mode 100644 index 00000000..76ea759d --- /dev/null +++ b/src/main/resources/mybatisMapper/BudgetMapper.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/js/budget/assign.js b/src/main/resources/static/js/budget/assign.js index 7961f2b9..574819ec 100644 --- a/src/main/resources/static/js/budget/assign.js +++ b/src/main/resources/static/js/budget/assign.js @@ -339,8 +339,8 @@ $(document).on('click', '#assignSaveBtn', function (){ params = {} params.year = $("#orgYear").val(); // console.dir($("#org"+j+"_amount"+i)[0].dataset.code); - params.code = $("#org"+j+"_amount"+i)[0].dataset.code; - params.amount = $("#org"+j+"_amount"+i).val() == "" ? 0 :$("#org"+j+"_amount"+i).val() + params.code = $("#org"+j+"Amount"+i)[0].dataset.code; + params.amount = $("#org"+j+"Amount"+i).val() == "" ? 0 :$("#org"+j+"Amount"+i).val() params.org = $("#code").val(); params.org1 = $("#orgSave"+j).text(); // console.dir(params.org); diff --git a/src/main/resources/templates/budget/assign.html b/src/main/resources/templates/budget/assign.html index add3f4bc..b6e2abe9 100644 --- a/src/main/resources/templates/budget/assign.html +++ b/src/main/resources/templates/budget/assign.html @@ -81,60 +81,60 @@ - - - - + + + - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/templates/budget/assignEditModal.html b/src/main/resources/templates/budget/assignEditModal.html index 162dfc85..6b29ace8 100644 --- a/src/main/resources/templates/budget/assignEditModal.html +++ b/src/main/resources/templates/budget/assignEditModal.html @@ -46,89 +46,89 @@ - - - - - + + + + + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + diff --git a/src/main/resources/templates/budget/expense.html b/src/main/resources/templates/budget/expense.html index f20e83a1..f3f91a50 100644 --- a/src/main/resources/templates/budget/expense.html +++ b/src/main/resources/templates/budget/expense.html @@ -85,99 +85,99 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/templates/budget/expenseEditModal.html b/src/main/resources/templates/budget/expenseEditModal.html index f7b7db70..8d40c921 100644 --- a/src/main/resources/templates/budget/expenseEditModal.html +++ b/src/main/resources/templates/budget/expenseEditModal.html @@ -78,11 +78,11 @@ - - - - - + + + + + diff --git a/src/main/resources/templates/budget/statsDetail.html b/src/main/resources/templates/budget/statsDetail.html index d51b5a60..a3833d46 100644 --- a/src/main/resources/templates/budget/statsDetail.html +++ b/src/main/resources/templates/budget/statsDetail.html @@ -61,7 +61,7 @@
@@ -97,12 +97,12 @@ - - - - - - + + + + + + diff --git a/src/main/resources/templates/budget/statsOrg.html b/src/main/resources/templates/budget/statsOrg.html index 47d37de5..cb29c9a9 100644 --- a/src/main/resources/templates/budget/statsOrg.html +++ b/src/main/resources/templates/budget/statsOrg.html @@ -103,62 +103,62 @@ - - - + + + - - - - + + + + - - - 11 - + + + 11 + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + +