From 28445f04434565df9596704f912eb2168f089ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Thu, 17 Nov 2022 11:34:57 +0900 Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EA=B2=BD=EC=B0=B0=20?= =?UTF-8?q?=EC=A0=95=EC=9B=90/=ED=98=84=EC=9B=90=20=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EB=A7=88=EC=B9=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/config/BaseController.java | 2 +- .../dbnt/faisp/config/ModalController.java | 4 +- .../com/dbnt/faisp/kwms/KwmsController.java | 24 +++---- .../main/codeMgt/service/CodeMgtService.java | 10 ++- .../faisp/main/faRpt/FaRptController.java | 2 +- .../FishingBoatController.java | 36 +++++------ .../InternationalCrimeArrestController.java | 2 +- .../main/fpiMgt/affair/AffairController.java | 4 +- .../fpiMgt/affairResult/ResultController.java | 8 +-- .../faisp/main/menuMgt/MenuMgtController.java | 6 +- .../main/organMgt/OrganConfigController.java | 2 +- .../publicBoard/PublicBoardController.java | 2 +- .../faisp/main/userInfo/FaispController.java | 30 +++++---- .../faisp/main/userInfo/MyInfoController.java | 14 ++-- .../main/userInfo/model/PersonnelStatus.java | 8 +-- .../repository/PersonnelStatusRepository.java | 3 + .../userInfo/service/UserInfoService.java | 9 ++- .../main/userInfo/userMgtController.java | 14 ++-- .../mybatisMapper/UserInfoMapper.xml | 4 +- .../static/js/faisp/personnelStatus.js | 22 ++++++- .../personnelStatus.html | 22 ++++++- .../personnelStatusHistory.html | 64 +++++++++++++++++++ .../personnelStatusRow.html | 0 23 files changed, 205 insertions(+), 87 deletions(-) rename src/main/resources/templates/faisp/{ => personnelStatus}/personnelStatus.html (87%) create mode 100644 src/main/resources/templates/faisp/personnelStatus/personnelStatusHistory.html rename src/main/resources/templates/faisp/{ => personnelStatus}/personnelStatusRow.html (100%) diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index 441bb017..81bb7791 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -62,7 +62,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/ModalController.java b/src/main/java/com/dbnt/faisp/config/ModalController.java index c436c673..9f366ab7 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 7b402231..dc6567b1 100644 --- a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java +++ b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java @@ -31,12 +31,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"); @@ -58,12 +58,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"); 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 3b256722..18785c22 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 @@ -60,11 +60,15 @@ public class CodeMgtService{ return categoryMap; } - public List selectCodeMgtList(String categoryCd) { - return codeMgtRepository.findByCategoryCdAndUseChkOrderByItemCdAsc(categoryCd, "T"); + 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())); + } + return codeList; } public String searchCode(String categoryCd, String value){ - List codeList = selectCodeMgtList(categoryCd); + List codeList = selectCodeMgtList(categoryCd, ""); for(CodeMgt code: codeList){ if(code.getItemValue().equals(value)){ return code.getItemCd(); 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 5334c35f..ff977db6 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 6674b2b1..8c49a237 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 d93e5e6d..bf3afff3 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 14cc8d16..fb4440f0 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 9463a978..881985ea 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/menuMgt/MenuMgtController.java b/src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java index 879700af..8e5e8b99 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 5ad9f0a3..24cee8ca 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 cc500ffd..b8e7e1bc 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/FaispController.java b/src/main/java/com/dbnt/faisp/main/userInfo/FaispController.java index c0fe804e..1c55f5fc 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/FaispController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/FaispController.java @@ -92,13 +92,13 @@ public class FaispController { @GetMapping("/policeEditModal") public ModelAndView policeEditModal(@AuthenticationPrincipal UserInfo loginUser,UserInfo userInfo){ ModelAndView mav = new ModelAndView("/faisp/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(), "/faisp/policeList").get(0).getAccessAuth(); @@ -153,7 +153,7 @@ public class FaispController { @GetMapping("/personnelStatus") public ModelAndView personnelStatus(@AuthenticationPrincipal UserInfo loginUser, PersonnelStatus personnelStatus){ - ModelAndView mav = new ModelAndView("faisp/personnelStatus"); + ModelAndView mav = new ModelAndView("faisp/personnelStatus/personnelStatus"); //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faisp/personnelStatus").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); @@ -163,9 +163,7 @@ public class FaispController { } personnelStatus.setDownOrganCdList(loginUser.getDownOrganCdList()); mav.addObject("searchParams", personnelStatus); - List jtList = codeMgtService.selectCodeMgtList("JT"); - jtList.sort((o1, o2) -> o2.getItemCd().compareTo(o1.getItemCd())); - mav.addObject("jtList", jtList); + mav.addObject("jtList", codeMgtService.selectCodeMgtList("JT", "reverse")); List statusList = userInfoService.selectPersonnelStatusList(personnelStatus); statusList = calcStatusList(statusList); mav.addObject("statusSummary", makeStatusSummary(statusList)); @@ -175,7 +173,7 @@ public class FaispController { @GetMapping("/personnelStatusRow") public ModelAndView personnelStatusRow(@AuthenticationPrincipal UserInfo loginUser){ - ModelAndView mav = new ModelAndView("faisp/personnelStatusRow"); + ModelAndView mav = new ModelAndView("faisp/personnelStatus/personnelStatusRow"); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); return mav; } @@ -192,6 +190,14 @@ public class FaispController { public void savePersonnelStatus(@AuthenticationPrincipal UserInfo loginUser, @RequestBody List personnelStatusList){ userInfoService.savePersonnelStatus(loginUser, personnelStatusList); } + @GetMapping("/personnelStatusHistory") + public ModelAndView personnelStatusHistory(PersonnelStatus status){ + ModelAndView mav = new ModelAndView("faisp/personnelStatus/personnelStatusHistory"); + mav.addObject("jtList", codeMgtService.selectCodeMgtList("JT", "reverse")); + List statusList = userInfoService.selectPersonnelStatusHistoryList(status); + mav.addObject("statusList", calcStatusList(statusList)); + return mav; + } @GetMapping("/careerMgt") public ModelAndView careerMgt(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo, HttpServletResponse response){ 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 2ec0f9ea..e0c33884 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java @@ -25,13 +25,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; diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/model/PersonnelStatus.java b/src/main/java/com/dbnt/faisp/main/userInfo/model/PersonnelStatus.java index 8e1b82f9..b2e6de12 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/model/PersonnelStatus.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/model/PersonnelStatus.java @@ -55,10 +55,10 @@ public class PersonnelStatus extends BaseModel { private Integer jt001Max = 0; @Column(name = "jt001_now") private Integer jt001Now = 0; - @Column(name = "organ_cd") - private String organCd; - @Column(name = "part_cd") - private String partCd; + @Column(name = "wrt_organ") + private String wrtOrgan; + @Column(name = "wrt_part") + private String wrtPart; @Column(name = "wrt_user_seq") private Integer wrtUserSeq; @Column(name = "wrt_user_grd") diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/repository/PersonnelStatusRepository.java b/src/main/java/com/dbnt/faisp/main/userInfo/repository/PersonnelStatusRepository.java index 3503089a..3d5e1b16 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/repository/PersonnelStatusRepository.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/repository/PersonnelStatusRepository.java @@ -3,8 +3,11 @@ package com.dbnt.faisp.main.userInfo.repository; import com.dbnt.faisp.main.userInfo.model.PersonnelStatus; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; import java.util.Optional; public interface PersonnelStatusRepository extends JpaRepository { Optional findTop1ByYearAndOgCdOrderByVersionNoDesc(String year, String ogCd); + + List findByYearAndOgCdOrderByVersionNoDesc(String year, String ogCd); } diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java b/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java index 8e8e3a7c..48c2034d 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java @@ -313,8 +313,8 @@ public class UserInfoService implements UserDetailsService { for(PersonnelStatus status: personnelStatusList){ PersonnelStatus lastVersion = personnelStatusRepository.findTop1ByYearAndOgCdOrderByVersionNoDesc(status.getYear(), status.getOgCd()).orElse(null); status.setVersionNo(lastVersion==null?1:(lastVersion.getVersionNo()+1)); - status.setOrganCd(loginUser.getOgCd()); - status.setPartCd(loginUser.getOfcCd()); + status.setWrtOrgan(loginUser.getOgCd()); + status.setWrtPart(loginUser.getOfcCd()); status.setWrtUserSeq(loginUser.getUserSeq()); status.setWrtUserNm(loginUser.getUserNm()); status.setWrtUserGrd(loginUser.getTitleCd()); @@ -327,6 +327,10 @@ public class UserInfoService implements UserDetailsService { return userInfoMapper.nowPersonnelStatus(ogCd); } + public List selectPersonnelStatusHistoryList(PersonnelStatus status) { + return personnelStatusRepository.findByYearAndOgCdOrderByVersionNoDesc(status.getYear(), status.getOgCd()); + } + public UserInfo selectPoliceInfo(Integer userSeq) { return userInfoMapper.selectPoliceInfo(userSeq); } @@ -368,5 +372,4 @@ public class UserInfoService implements UserDetailsService { userEduRepository.deleteById(new UserEduId(userEdu.getEduSeq(), userEdu.getUserSeq())); return userEdu.getUserSeq(); } - } 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 a87c736c..e31c10ea 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/userMgtController.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/userMgtController.java @@ -39,13 +39,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 2cbb55fb..87651da2 100644 --- a/src/main/resources/mybatisMapper/UserInfoMapper.xml +++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml @@ -209,8 +209,8 @@ jt002_now, jt001_max, jt001_now, - a.organ_cd, - part_cd, + wrt_organ, + wrt_part, wrt_user_seq, wrt_user_grd, wrt_user_nm, diff --git a/src/main/resources/static/js/faisp/personnelStatus.js b/src/main/resources/static/js/faisp/personnelStatus.js index 5cdc808f..c74c7837 100644 --- a/src/main/resources/static/js/faisp/personnelStatus.js +++ b/src/main/resources/static/js/faisp/personnelStatus.js @@ -31,7 +31,7 @@ $(document).on('change', '.ogCd', function (){ $.ajax({ url: '/faisp/selectPersonnelStatus', type: 'GET', - data: {year: $("#year").val(), ogCd: this.value}, + data: {year: new Date().getFullYear(), ogCd: this.value}, dataType:"json", success: function(data){ personnelStatusRow.find(".jt007Max").val(data.jt007Max); @@ -92,10 +92,11 @@ $(document).on('click', '#saveBtn', function (){ if(confirm("저장하시겠습니까?")){ contentFade("in"); const personnelStatusList = []; + const year = new Date().getFullYear(); $.each($(".personnelStatusRow"), function(idx, personnelStatus){ const row = $(personnelStatus); personnelStatusList.push({}); - personnelStatusList[idx].year = $("#year").val(); + personnelStatusList[idx].year = year; personnelStatusList[idx].ogCd = row.find(".ogCd").val() personnelStatusList[idx].jt007Max = row.find(".jt007Max").val() personnelStatusList[idx].jt007Now = row.find(".jt007Now").val() @@ -135,6 +136,23 @@ $(document).on('click', '#saveBtn', function (){ } }) +$(document).on('click', '.statusTr', function (){ + const statusTr = $(this); + $.ajax({ + url: '/faisp/personnelStatusHistory', + type: 'GET', + data: {year: statusTr.find(".year").val(), ogCd: statusTr.find(".ogCd").val()}, + dataType:"html", + success: function(html){ + $("#personnelStatusHistoryModalBody").empty().append(html) + $("#personnelStatusHistoryModal").modal('show'); + }, + error:function(){ + + } + }); +}) + function personnelStatusOgCdCheck(){ let flag = true; $.each($(".ogCd"), function(idx, selectBox){ diff --git a/src/main/resources/templates/faisp/personnelStatus.html b/src/main/resources/templates/faisp/personnelStatus/personnelStatus.html similarity index 87% rename from src/main/resources/templates/faisp/personnelStatus.html rename to src/main/resources/templates/faisp/personnelStatus/personnelStatus.html index 91fea366..da6bb521 100644 --- a/src/main/resources/templates/faisp/personnelStatus.html +++ b/src/main/resources/templates/faisp/personnelStatus/personnelStatus.html @@ -74,6 +74,8 @@ + + @@ -81,7 +83,7 @@ - + @@ -154,5 +156,23 @@ + + + \ No newline at end of file diff --git a/src/main/resources/templates/faisp/personnelStatus/personnelStatusHistory.html b/src/main/resources/templates/faisp/personnelStatus/personnelStatusHistory.html new file mode 100644 index 00000000..c7f0eeba --- /dev/null +++ b/src/main/resources/templates/faisp/personnelStatus/personnelStatusHistory.html @@ -0,0 +1,64 @@ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
관서정원현원과부족수정자수정일
정원현원
+ + + + + + + + + + + +
+
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/faisp/personnelStatusRow.html b/src/main/resources/templates/faisp/personnelStatus/personnelStatusRow.html similarity index 100% rename from src/main/resources/templates/faisp/personnelStatusRow.html rename to src/main/resources/templates/faisp/personnelStatus/personnelStatusRow.html