diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index e973d933..7a309464 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -64,7 +64,7 @@ public class BaseController { @GetMapping("/selectBoxOptions") public ModelAndView codeMgtPage(String categoryCd, String selectedCd) { ModelAndView mav = new ModelAndView("common/selectBox/options"); - mav.addObject("codeList", codeMgtService.selectCodeMgtList(categoryCd, "")); + mav.addObject("codeList", codeMgtService.selectCodeMgtList(categoryCd)); mav.addObject("selectedCd", selectedCd); return mav; } diff --git a/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java b/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java index c65111e8..159de783 100644 --- a/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java +++ b/src/main/java/com/dbnt/faisp/config/FaispInterceptor.java @@ -40,7 +40,7 @@ public class FaispInterceptor implements HandlerInterceptor { @Override public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { //페이지 렌더링 후 실행. - if(request.getParameter("dashboardFlag").equals("true")){ + if(request.getParameter("dashboardFlag") == null){ // 대시보드 ajax 조회 로그 저장시 키 중첩으로 오류 발생. // 대시보드 ajax 조회는 로그를 쌓지 않음. UserRequestLog log = new UserRequestLog(); diff --git a/src/main/java/com/dbnt/faisp/config/ModalController.java b/src/main/java/com/dbnt/faisp/config/ModalController.java index 9f366ab7..c436c673 100644 --- a/src/main/java/com/dbnt/faisp/config/ModalController.java +++ b/src/main/java/com/dbnt/faisp/config/ModalController.java @@ -54,8 +54,8 @@ public class ModalController { if(userInfo.getUserStatus() == null || userInfo.getUserStatus().equals("")) { userInfo.setUserStatus("USC003"); } - mav.addObject("OgList", codeMgtService.selectCodeMgtList("OG", "")); - mav.addObject("OfcList", codeMgtService.selectCodeMgtList("OFC", "")); + mav.addObject("OgList", codeMgtService.selectCodeMgtList("OG")); + mav.addObject("OfcList", codeMgtService.selectCodeMgtList("OFC")); mav.addObject("userInfoList", userInfoService.selectUserInfoList(userInfo)); userInfo.setContentCnt(userInfoService.selectUserInfoListCnt(userInfo)); userInfo.setPaginationInfo(); diff --git a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java index 62d9e2df..ccb492f5 100644 --- a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java +++ b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java @@ -32,12 +32,12 @@ public class KwmsController { }else{ mav.addObject("joinFlag", "T"); mav.addObject("userInfo", userInfo); - mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG", "")); - mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC", "")); - mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT", "")); - mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC", "")); - mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC", "")); - mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG", "")); + mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); + mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC")); + mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); + mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC")); + mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC")); + mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); } }else{ mav.addObject("joinFlag", "F"); @@ -59,12 +59,12 @@ public class KwmsController { }else{ mav.addObject("joinFlag", "T"); mav.addObject("userInfo", userInfo); - mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG", "")); - mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC", "")); - mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT", "")); - mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC", "")); - mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC", "")); - mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG", "")); + mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); + mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC")); + mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); + mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC")); + mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC")); + mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); } }else{ mav.addObject("joinFlag", "F"); @@ -77,7 +77,7 @@ public class KwmsController { @GetMapping("/kwmsCareerModal") public ModelAndView kwmsCareerModal(Integer userSeq, String dicCode){ ModelAndView mav = new ModelAndView("faisp/career/kwmsCareerModal"); - mav.addObject("crcList", codeMgtService.selectCodeMgtList("CRC", "")); + mav.addObject("crcList", codeMgtService.selectCodeMgtList("CRC")); mav.addObject("careerList", kwmsService.selectUserCareerList(userSeq, dicCode)); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java b/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java index 6684e3a4..f2fe6559 100644 --- a/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java +++ b/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java @@ -59,11 +59,12 @@ public class CodeMgtService{ return categoryMap; } - public List selectCodeMgtList(String categoryCd, String orderBy) { - List codeList = codeMgtRepository.findByCategoryCdAndUseChkOrderByItemCdAsc(categoryCd, "T"); - if(orderBy.equals("reverse")){ - codeList.sort((o1, o2) -> o2.getItemCd().compareTo(o1.getItemCd())); - } + public List selectCodeMgtList(String categoryCd) { + return codeMgtRepository.findByCategoryCdAndUseChkOrderByItemCdAsc(categoryCd, "T"); + } + public List selectCodeMgtListOrderByDesc(String categoryCd){ + List codeList = selectCodeMgtList(categoryCd); + codeList.sort((o1, o2) -> o2.getItemCd().compareTo(o1.getItemCd())); return codeList; } public String searchCodeToCategoryAndValue(String categoryCd, String value){ diff --git a/src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java b/src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java index ff977db6..5334c35f 100644 --- a/src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java +++ b/src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java @@ -87,7 +87,7 @@ public class FaRptController { faRptBoard.setWrtUserNm(loginUser.getUserNm()); faRptBoard.setWrtDt(LocalDateTime.now()); } - mav.addObject("frCategoryList", codeMgtService.selectCodeMgtList("FRC", "")); + mav.addObject("frCategoryList", codeMgtService.selectCodeMgtList("FRC")); mav.addObject("faRpt", faRptBoard); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java index 8c49a237..6674b2b1 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java @@ -56,14 +56,14 @@ public class FishingBoatController { //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/processResult").get(0).getAccessAuth()); - mav.addObject("ataList", codeMgtService.selectCodeMgtList("ATA", "")); - mav.addObject("cpoList", codeMgtService.selectCodeMgtList("CPO", "")); - mav.addObject("vtList", codeMgtService.selectCodeMgtList("VT", "")); - mav.addObject("ftList", codeMgtService.selectCodeMgtList("FT", "")); - mav.addObject("bmList", codeMgtService.selectCodeMgtList("BM", "")); - mav.addObject("prList", codeMgtService.selectCodeMgtList("PR", "")); - mav.addObject("bdtList", codeMgtService.selectCodeMgtList("BDT", "")); - mav.addObject("boatList", codeMgtService.selectCodeMgtList(crackdownStatus.getCrackdownPolice(), "")); + mav.addObject("ataList", codeMgtService.selectCodeMgtList("ATA")); + mav.addObject("cpoList", codeMgtService.selectCodeMgtList("CPO")); + mav.addObject("vtList", codeMgtService.selectCodeMgtList("VT")); + mav.addObject("ftList", codeMgtService.selectCodeMgtList("FT")); + mav.addObject("bmList", codeMgtService.selectCodeMgtList("BM")); + mav.addObject("prList", codeMgtService.selectCodeMgtList("PR")); + mav.addObject("bdtList", codeMgtService.selectCodeMgtList("BDT")); + mav.addObject("boatList", codeMgtService.selectCodeMgtList(crackdownStatus.getCrackdownPolice())); mav.addObject("userSeq", loginUser.getUserSeq()); return mav; } @@ -82,13 +82,13 @@ public class FishingBoatController { crackdownStatus.getFishingBoat().setWrtUserNm(loginUser.getUserNm()); crackdownStatus.getFishingBoat().setWrtUserGrd(loginUser.getTitleCd()); } - mav.addObject("ataList", codeMgtService.selectCodeMgtList("ATA", "")); - mav.addObject("cpoList", codeMgtService.selectCodeMgtList("CPO", "")); - mav.addObject("vtList", codeMgtService.selectCodeMgtList("VT", "")); - mav.addObject("ftList", codeMgtService.selectCodeMgtList("FT", "")); - mav.addObject("bmList", codeMgtService.selectCodeMgtList("BM", "")); - mav.addObject("prList", codeMgtService.selectCodeMgtList("PR", "")); - mav.addObject("bdtList", codeMgtService.selectCodeMgtList("BDT", "")); + mav.addObject("ataList", codeMgtService.selectCodeMgtList("ATA")); + mav.addObject("cpoList", codeMgtService.selectCodeMgtList("CPO")); + mav.addObject("vtList", codeMgtService.selectCodeMgtList("VT")); + mav.addObject("ftList", codeMgtService.selectCodeMgtList("FT")); + mav.addObject("bmList", codeMgtService.selectCodeMgtList("BM")); + mav.addObject("prList", codeMgtService.selectCodeMgtList("PR")); + mav.addObject("bdtList", codeMgtService.selectCodeMgtList("BDT")); mav.addObject("crackdownStatus", crackdownStatus); return mav; } @@ -109,9 +109,9 @@ public class FishingBoatController { public ModelAndView fishingBoatVersionInfo(FishingBoatVersion version){ ModelAndView mav = new ModelAndView("faStatistics/fishingBoat/fishingBoardVersionInfo"); mav.addObject("fishingBoat", fishingBoatService.selectFishingBoatVersion(version.getFbKey(), version.getVersionNo())); - mav.addObject("vtList", codeMgtService.selectCodeMgtList("VT", "")); - mav.addObject("ftList", codeMgtService.selectCodeMgtList("FT", "")); - mav.addObject("bmList", codeMgtService.selectCodeMgtList("BM", "")); + mav.addObject("vtList", codeMgtService.selectCodeMgtList("VT")); + mav.addObject("ftList", codeMgtService.selectCodeMgtList("FT")); + mav.addObject("bmList", codeMgtService.selectCodeMgtList("BM")); return mav; } } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java index bf3afff3..d93e5e6d 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java @@ -124,7 +124,7 @@ public class InternationalCrimeArrestController { } public List selectOrganList(){ - List organCdList = codeMgtService.selectCodeMgtList("OG", ""); + List organCdList = codeMgtService.selectCodeMgtList("OG"); List organConfigList = organConfigService.selectSavedOrganList(); for(CodeMgt organCode: organCdList){ if(!organCode.getItemCd().equals("OG001")){ diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java index fb4440f0..14cc8d16 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java @@ -116,7 +116,7 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 affairBoard.setContentCnt(affairService.selectAffairBoardListCnt(affairBoard)); affairBoard.setPaginationInfo(); mav.addObject("searchParams", affairBoard); - mav.addObject("ratingCodeList", codeMgtService.selectCodeMgtList("AAR", "")); + mav.addObject("ratingCodeList", codeMgtService.selectCodeMgtList("AAR")); return mav; } @@ -211,7 +211,7 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 (loginUser.getUserSeq(), "/affair/affairMgt?affairCategory="+affairBoard.getAffairCategory()).get(0).getApprovalAuth(); mav.addObject("apprvAuth", apprvAuth); if(apprvAuth!=null && (apprvAuth.equals("APC002") || apprvAuth.equals("APC001"))){ - mav.addObject("ratingCodeList", codeMgtService.selectCodeMgtList("AAR", "")); + mav.addObject("ratingCodeList", codeMgtService.selectCodeMgtList("AAR")); } return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java index 881985ea..9463a978 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java @@ -174,8 +174,8 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 resultBoard.setWrtDt(LocalDateTime.now()); } mav.addObject("result", resultBoard); - mav.addObject("categoryList", codeMgtService.selectCodeMgtList("RIC", "")); - mav.addObject("codeList", codeMgtService.selectCodeMgtList("RID", "")); + mav.addObject("categoryList", codeMgtService.selectCodeMgtList("RIC")); + mav.addObject("codeList", codeMgtService.selectCodeMgtList("RID")); return mav; } @@ -223,8 +223,8 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 public ModelAndView getClearInfoRow(ClearInfo info){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairResult/clearInfoRow"); mav.addObject("info", info); - mav.addObject("categoryList", codeMgtService.selectCodeMgtList("RIC", "")); - mav.addObject("codeList", codeMgtService.selectCodeMgtList("RID", "")); + mav.addObject("categoryList", codeMgtService.selectCodeMgtList("RIC")); + mav.addObject("codeList", codeMgtService.selectCodeMgtList("RID")); return mav; } @GetMapping("/getResultInfoRow") diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/SriController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/SriController.java index 15f252e1..8c8fcc12 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/SriController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/SriController.java @@ -86,7 +86,7 @@ public class SriController { sri.setWrtUserNm(loginUser.getUserNm()); sri.setWrtDt(LocalDateTime.now()); } - mav.addObject("SriCategoryList", codeMgtService.selectCodeMgtList("SRI","")); + mav.addObject("SriCategoryList", codeMgtService.selectCodeMgtList("SRI")); mav.addObject("sri", sri); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java b/src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java index 8e5e8b99..879700af 100644 --- a/src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java +++ b/src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java @@ -33,9 +33,9 @@ public class MenuMgtController { public ModelAndView menuEditModal(MenuMgt menuMgt){ ModelAndView mav = new ModelAndView("adminPage/menuMgt/menuEditModal"); mav.addObject("menuMgt", menuMgt); - mav.addObject("cat1List", codeMgtService.selectCodeMgtList("CAT1", "")); - mav.addObject("cat2List", codeMgtService.selectCodeMgtList("CAT2", "")); - mav.addObject("cat3List", codeMgtService.selectCodeMgtList("CAT3", "")); + mav.addObject("cat1List", codeMgtService.selectCodeMgtList("CAT1")); + mav.addObject("cat2List", codeMgtService.selectCodeMgtList("CAT2")); + mav.addObject("cat3List", codeMgtService.selectCodeMgtList("CAT3")); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/organMgt/OrganConfigController.java b/src/main/java/com/dbnt/faisp/main/organMgt/OrganConfigController.java index 24cee8ca..5ad9f0a3 100644 --- a/src/main/java/com/dbnt/faisp/main/organMgt/OrganConfigController.java +++ b/src/main/java/com/dbnt/faisp/main/organMgt/OrganConfigController.java @@ -28,7 +28,7 @@ public class OrganConfigController { @GetMapping("/selectOrganList") public List selectOrganList(){ - List organCdList = codeMgtService.selectCodeMgtList("OG", ""); + List organCdList = codeMgtService.selectCodeMgtList("OG"); List organConfigList = organConfigService.selectSavedOrganList(); for(CodeMgt organCode: organCdList){ if(!organCode.getItemCd().equals("OG001")){ diff --git a/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java b/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java index b8e7e1bc..cc500ffd 100644 --- a/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java +++ b/src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java @@ -71,7 +71,7 @@ public class PublicBoardController { mav.addObject("referenceList", publicBoardService.selectContentList(publicBoard)); publicBoard.setContentCnt(publicBoardService.selectContentListCnt(publicBoard)); publicBoard.setPaginationInfo(); - mav.addObject("tabStatusList", codeMgtService.selectCodeMgtList("RPC", "")); + mav.addObject("tabStatusList", codeMgtService.selectCodeMgtList("RPC")); mav.addObject("searchParams", publicBoard); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java b/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java index efd66496..d4b12317 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java @@ -30,13 +30,13 @@ public class MyInfoController { public ModelAndView myInfoPage(@AuthenticationPrincipal UserInfo loginUser){ ModelAndView mav = new ModelAndView("user/myInfo"); mav.addObject("userInfo", userInfoService.selectUserInfo(loginUser.getUserSeq())); - mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG", "")); - mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC", "")); - mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT", "")); - mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC", "")); - mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC", "")); - mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG", "")); - mav.addObject("statusList", codeMgtService.selectCodeMgtList("USC", "")); + mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); + mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC")); + mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); + mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC")); + mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC")); + mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); + mav.addObject("statusList", codeMgtService.selectCodeMgtList("USC")); mav.addObject("dashboardConfigList", userInfoService.getDashboardConfigList(loginUser.getUserSeq())); return mav; @@ -92,6 +92,9 @@ public class MyInfoController { ModelAndView mav = new ModelAndView("user/myAlarm"); alarm.setQueryInfo(); alarm.setUserSeq(loginUser.getUserSeq()); + mav.addObject("cat1List", codeMgtService.selectCodeMgtList("CAT1")); + mav.addObject("cat2List", codeMgtService.selectCodeMgtList("CAT2")); + mav.addObject("cat3List", codeMgtService.selectCodeMgtList("CAT3")); mav.addObject("pageAlarmList", userAlarmService.selectAlarmList(alarm)); alarm.setContentCnt(userAlarmService.selectAlarmListCnt(alarm)); alarm.setPaginationInfo(); diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java b/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java index d34fc8d7..580dde38 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java @@ -88,13 +88,13 @@ public class PoliceController { @GetMapping("/policeEditModal") public ModelAndView policeEditModal(@AuthenticationPrincipal UserInfo loginUser,UserInfo userInfo){ ModelAndView mav = new ModelAndView("police/police/policeEditModal"); - mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG", "")); - mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC", "")); - mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT", "")); - mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC", "")); - mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC", "")); - mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG", "")); - mav.addObject("statusList", codeMgtService.selectCodeMgtList("USC", "")); + mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); + mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC")); + mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); + mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC")); + mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC")); + mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); + mav.addObject("statusList", codeMgtService.selectCodeMgtList("USC")); //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/police/policeList").get(0).getAccessAuth(); @@ -159,7 +159,7 @@ public class PoliceController { } personnelStatus.setDownOrganCdList(loginUser.getDownOrganCdList()); mav.addObject("searchParams", personnelStatus); - mav.addObject("jtList", codeMgtService.selectCodeMgtList("JT", "reverse")); + mav.addObject("jtList", codeMgtService.selectCodeMgtListOrderByDesc("JT")); List statusList = policeService.selectPersonnelStatusList(personnelStatus); statusList = calcStatusList(statusList); mav.addObject("statusSummary", makeStatusSummary(statusList)); @@ -189,7 +189,7 @@ public class PoliceController { @GetMapping("/personnelStatusHistory") public ModelAndView personnelStatusHistory(PersonnelStatus status){ ModelAndView mav = new ModelAndView("police/personnelStatus/personnelStatusHistory"); - mav.addObject("jtList", codeMgtService.selectCodeMgtList("JT", "reverse")); + mav.addObject("jtList", codeMgtService.selectCodeMgtListOrderByDesc("JT")); List statusList = policeService.selectPersonnelStatusHistoryList(status); mav.addObject("statusList", calcStatusList(statusList)); return mav; @@ -223,7 +223,7 @@ public class PoliceController { String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/police/careerMgt").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); mav.addObject("selectedTab", career.getCareerCd()); - mav.addObject("crcList", codeMgtService.selectCodeMgtList("CRC", "")); + mav.addObject("crcList", codeMgtService.selectCodeMgtList("CRC")); mav.addObject("userInfo", policeService.selectPoliceInfo(career.getUserSeq())); mav.addObject("careerList", policeService.selectCareerList(career.getUserSeq())); mav.addObject("userSeq", loginUser.getUserSeq()); @@ -232,11 +232,11 @@ public class PoliceController { @GetMapping("/careerFormModal") public ModelAndView careerFormModal(@AuthenticationPrincipal UserInfo loginUser, UserCareer career){ ModelAndView mav = new ModelAndView("police/career/careerFormModal"); - mav.addObject("crcList", codeMgtService.selectCodeMgtList("CRC", "")); - mav.addObject("dsnList", codeMgtService.selectCodeMgtList("DSN", "")); - mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG", "")); - mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC", "")); - mav.addObject("jtList", codeMgtService.selectCodeMgtList("JT", "")); + mav.addObject("crcList", codeMgtService.selectCodeMgtList("CRC")); + mav.addObject("dsnList", codeMgtService.selectCodeMgtList("DSN")); + mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); + mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC")); + mav.addObject("jtList", codeMgtService.selectCodeMgtList("JT")); mav.addObject("career", career); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java b/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java index 384b6299..d4cfb773 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java @@ -43,13 +43,13 @@ public class UserMgtController { @GetMapping("/userEditModal") public ModelAndView menuEditModal(UserInfo userInfo){ ModelAndView mav = new ModelAndView("adminPage/userMgt/userEditModal"); - mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG", "")); - mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC", "")); - mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT", "")); - mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC", "")); - mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC", "")); - mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG", "")); - mav.addObject("statusList", codeMgtService.selectCodeMgtList("USC", "")); + mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); + mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC")); + mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); + mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC")); + mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC")); + mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); + mav.addObject("statusList", codeMgtService.selectCodeMgtList("USC")); mav.addObject("userInfo", userInfoService.selectUserInfo(userInfo.getUserSeq())); return mav; diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml index 9a1b6fbf..33eada68 100644 --- a/src/main/resources/mybatisMapper/UserInfoMapper.xml +++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml @@ -396,6 +396,24 @@ and a.view_yn = #{viewYn} + + and b.cat1_cd = #{cat1Cd} + + + and b.cat2_cd = #{cat2Cd} + + + and b.cat3_cd = #{cat3Cd} + + + and a.alarm_msg like '%'||#{alarmMsg}||'%' + + + And a.wrt_dt >= #{startDate}::DATE + + + AND a.wrt_dt <= #{endDate}::DATE+1 +
@@ -18,15 +29,54 @@
-
+
-
-
- - +
+
+
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+ + +
+
- +
+ +