From 31fcd9dd69cce1102bff79404e45902f48067d36 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 13:48:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=98=88=EC=82=B0=ED=8E=B8=EC=84=B1=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=EB=93=B1.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faisp/main/budget/BudgetController.java | 30 ++++------------- .../main/budget/mapper/BudgetMapper.java | 1 + .../main/budget/service/BudgetService.java | 3 +- .../resources/mybatisMapper/BudgetMapper.xml | 32 +++++++++++++++---- .../resources/templates/budget/assign.html | 18 +++++++---- 5 files changed, 45 insertions(+), 39 deletions(-) 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 efc8f49c..bcef1c56 100644 --- a/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java +++ b/src/main/java/com/dbnt/faisp/main/budget/BudgetController.java @@ -137,30 +137,21 @@ 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(); + requestDto.setCode(userOrgCode); mav.addObject("list"); // 첫해 첫날 ~ 오늘날짜 기본세팅 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); - - //Select box 관서 리스트 - List codeList = budgetService.selectGetLowerOrgCodeByName(loginUser); - mav.addObject("codeList", codeList); + mav.addObject("loginOrgan", loginUser.getOgCd()); mav.addObject("searchParams", requestDto); @@ -228,14 +219,8 @@ 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(); + requestDto.setCode(userOrgCode); mav.addObject("list"); @@ -249,9 +234,6 @@ public class BudgetController { List downOrgList = budgetService.selectDownOrg(userOrgCode); mav.addObject("downOrgList", downOrgList); - List codeList = budgetService.selectGetLowerOrgCodeByName(loginUser); - mav.addObject("codeList", codeList); - mav.addObject("searchParams", requestDto); return mav; 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 d5ab5e8c..ee2d2f6e 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 @@ -18,6 +18,7 @@ public interface BudgetMapper { List selectBudgetAssignInfoList(BudgetParams params); List selectBudgetAssignAmountList(BudgetParams params); List callSpGetDownOrg(BudgetParams param); + List selectDownOrgList(BudgetParams params); List callSpGetLowerOrgCodeByName(); String callSpGetHighOrgCode(BudgetParams params); UpdateResult callSpAddBudgetAssign(BudgetParams params); 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 8f7912e7..952f83cb 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 @@ -350,7 +350,8 @@ public class BudgetService { // return budgetRepository.callSpGetDownOrg(userOrgCode); BudgetParams params = new BudgetParams(); params.setOrg(userOrgCode); - return budgetMapper.callSpGetDownOrg(params); +// return budgetMapper.callSpGetDownOrg(params); + return budgetMapper.selectDownOrgList(params); } // diff --git a/src/main/resources/mybatisMapper/BudgetMapper.xml b/src/main/resources/mybatisMapper/BudgetMapper.xml index 307572e3..8ba70547 100644 --- a/src/main/resources/mybatisMapper/BudgetMapper.xml +++ b/src/main/resources/mybatisMapper/BudgetMapper.xml @@ -72,14 +72,19 @@ group by h_org_code, l_org_code, budget_code ) tba on tba.l_org_code = total.l_org_code and tba.budget_code = total.budget_code inner join ( - select (ROW_NUMBER() OVER()) AS order_seq, * + select (ROW_NUMBER() OVER()) AS order_seq, * from ( - select #{code} as organ_cd - union all - select organ_cd - from organ_config - where parent_organ = #{code} - ) a + select organ_cd + from ( + select #{code} as organ_cd + union all + select organ_cd + from organ_config + where parent_organ = #{code} + ) a + inner join code_mgt b on a.organ_cd = b.item_cd + order by b.order_num + ) a ) oc on total.l_org_code = oc.organ_cd order by order_seq, organ_cd, budget_code @@ -88,6 +93,19 @@ org_name as orgName from sp_get_down_org(#{org}) + > - - - + + + + + +