예산배정 오류 수정.

src/main/java/com/dbnt/faisp/main/budget/BudgetController.java

@@ -178,7 +178,8 @@ public class BudgetController {
     if (requestDto.getYear() != null) {
       userOrgCode = requestDto.getCode();
 
-      List<AssignResult> list = budgetService.selectBudgetAssignInfo(loginUser, requestDto);
+//      List<AssignResult> list = budgetService.selectBudgetAssignInfo(loginUser, requestDto);
+      List<AssignResult> list = budgetService.selectBudgetAssignInfoList(requestDto);
       mav.addObject("list", list);
     } else {
       // 로그인된 해당청 기본선택

src/main/java/com/dbnt/faisp/main/budget/model/BudgetParams.java

@@ -4,7 +4,7 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import java.util.Date;
+import java.time.LocalDate;
 
 @Getter
 @Setter
@@ -35,6 +35,6 @@ public class BudgetParams {
   private Integer amount;
   private String dt;
 
-  private Date stDate;
+  private LocalDate stDate;
-  private Date edDate;
+  private LocalDate edDate;
 }

src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java

@@ -236,11 +236,7 @@ public class BudgetService {
   // 예산편성 - 예산편성 저장(modal)
   @Transactional
   public void saveBudgetingList(UserInfo loginUser, BudgetDto.BudgetingSaveReqeust requestDto){
-//		System.out.println(requestDto.getAmount());
+
-//		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");
     BudgetParams params = new BudgetParams();
     params.setYear(requestDto.getYear());
     params.setCode1(requestDto.getNameL1());
@@ -251,15 +247,9 @@ public class BudgetService {
     params.setId("admin");
     UpdateResult result = budgetMapper.callSpUpdateBudgetPlanCodeItem(params);
 
-//		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.getErrorMessage());
-//            System.out.println(result.getResultCode());
-//            System.out.println(result.getResultCount());
       throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
     }
 
@@ -268,11 +258,7 @@ public class BudgetService {
   //예산편성 - 예산삭제(버튼)
   @Transactional
   public void deleteBudgeting(UserInfo loginUser,  BudgetDto.BudgetingSaveReqeust requestDto){
-//		System.out.println(requestDto.getYear());
+
-//		System.out.println(requestDto.getNameL1());
-//		System.out.println(requestDto.getNameL2());
-//		System.out.println(requestDto.getNameL3());
-//        UpdateResult result = budgetRepository.callSpDeleteBudgetPlan(requestDto.getYear(), "OG001", "admin");
     BudgetParams params = new BudgetParams();
     params.setYear(requestDto.getYear());
     params.setOrg("OG001");
@@ -282,9 +268,6 @@ public class BudgetService {
     if(result.getResultCode().equals("100")) {
       return;
     } else {
-//            System.out.println(result.getErrorMessage());
-//            System.out.println(result.getResultCode());
-//            System.out.println(result.getResultCount());
       throw new BaseException(ResultResponseCode.NOT_FOUND_CODE);
     }
 
@@ -296,8 +279,8 @@ public class BudgetService {
     params.setYear(requestDto.getYear());
     params.setCode(requestDto.getCode());
     params.setUser("admin");
-    params.setStDate(java.sql.Date.valueOf(requestDto.getStDate()));
+    params.setStDate(requestDto.getStDate());
-    params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate()));
+    params.setEdDate(requestDto.getEdDate());
     return budgetMapper.callSpGetBudgetAssignInfo(params);
   }
 
@@ -306,8 +289,8 @@ public class BudgetService {
     params.setYear(requestDto.getYear());
     params.setCode(requestDto.getCode());
     params.setUser("admin");
-    params.setStDate(java.sql.Date.valueOf(requestDto.getStDate()));
+    params.setStDate(requestDto.getStDate());
-    params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate()));
+    params.setEdDate(requestDto.getEdDate());
     List<AssignResult> assignResultList = budgetMapper.selectBudgetAssignInfoList(params);
     List<AssignAmount> assignAmountList = budgetMapper.selectBudgetAssignAmountList(params);
     for(AssignResult result: assignResultList){
@@ -418,8 +401,8 @@ public class BudgetService {
     params.setYear(requestDto.getYear());
     params.setCode(requestDto.getCode());
     params.setUser("admin");
-    params.setStDate(java.sql.Date.valueOf(requestDto.getStDate()));
+    params.setStDate(requestDto.getStDate());
-    params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate()));
+    params.setEdDate(requestDto.getEdDate());
     return  budgetMapper.callSpGetBudgetExpenseInfo(params);
   }
 
@@ -482,8 +465,8 @@ public class BudgetService {
     params.setYear(requestDto.getYear());
     params.setCode(requestDto.getCode());
     params.setUser("admin");
-    params.setStDate(java.sql.Date.valueOf(requestDto.getStDate()));
+    params.setStDate(requestDto.getStDate());
-    params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate()));
+    params.setEdDate(requestDto.getEdDate());
     params.setWon(requestDto.getWon());
     return  budgetMapper.callSpGetbudgetStatOrg(params);
   }
@@ -501,8 +484,8 @@ public class BudgetService {
     params.setCode(requestDto.getCode());
     params.setItem(requestDto.getItem());
     params.setUser("admin");
-    params.setStDate(java.sql.Date.valueOf(requestDto.getStDate()));
+    params.setStDate(requestDto.getStDate());
-    params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate()));
+    params.setEdDate(requestDto.getEdDate());
     params.setWon(requestDto.getWon());
     return  budgetMapper.callSpGetbudgetStatDetail(params);
   }

src/main/resources/mybatisMapper/BudgetMapper.xml

@@ -52,31 +52,35 @@
   <select id="selectBudgetAssignAmountList" resultType="AssignAmount" parameterType="BudgetParams">
     select oc.order_seq,
            oc.organ_cd,
-           tba.budget_code,
+           total.budget_code,
-           tba.period_assign_amount,
+           coalesce(tba.period_assign_amount, 0) as period_assign_amount,
-           coalesce(tbe.sum_assign_amount, 0) as sum_assign_amount
+           coalesce(total.sum_assign_amount, 0) as sum_assign_amount
     from (
-           select h_org_code, l_org_code, budget_code, sum(amount) as period_assign_amount
+          select l_org_code, budget_code, sum(amount) as sum_assign_amount
-           from tbl_budget_assign
+          from tbl_budget_assign
-           where h_org_code = #{code}
+          where h_org_code = #{code}
-           group by h_org_code, l_org_code, budget_code
+          and EXTRACT( year FROM assign_date ) = ${year}
-         ) tba
+          group by l_org_code, budget_code
-           left outer join (
+         ) total
-           select org_code, budget_code, sum(amount) as sum_assign_amount
+         left outer join
-           from tbl_budget_expense
+        (
-           where EXTRACT( year FROM expense_date ) = ${year}
+          select h_org_code, l_org_code, budget_code, sum(amount) as period_assign_amount
-           group by org_code, budget_code
+          from tbl_budget_assign
-         ) tbe on tba.l_org_code = tbe.org_code and tba.budget_code = tbe.budget_code
+          where h_org_code = #{code}
-           inner join (
+            and assign_date >= #{stDate}::date
-           select (ROW_NUMBER() OVER()) AS order_seq, *
+            and assign_date &lt;= #{edDate}::date
-           from (
+          group by h_org_code, l_org_code, budget_code
-                 select #{code} as organ_cd
+        ) tba on tba.l_org_code = total.l_org_code and tba.budget_code = total.budget_code
-                 union all
+        inner join (
-                 select organ_cd
+          select (ROW_NUMBER() OVER()) AS order_seq, *
-                 from organ_config
+          from (
-                 where parent_organ = #{code}
+              select #{code} as organ_cd
-               ) a
+              union all
-         ) oc on tba.l_org_code = oc.organ_cd
+              select organ_cd
+              from organ_config
+              where parent_organ = #{code}
+          ) a
+        ) oc on total.l_org_code = oc.organ_cd
     order by order_seq, organ_cd, budget_code
   </select>
   <select id="callSpGetDownOrg" resultType="CodeResult" parameterType="BudgetParams">

src/main/resources/templates/budget/assign.html

@@ -59,8 +59,8 @@
             </div>
           </form>
           <div class="row">
-            <div class="col-12">
+            <div class="col-12 overflow-auto">
-              <table class="table table-sm table-bordered table-hover">
+              <table class="table table-sm table-bordered table-hover text-nowrap">
                 <thead>
                 <tr class="table-secondary">
                   <th rowspan="2">사업명</th>