DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

알람페이지 검색기능 추가.

강석 최 2022-11-25 10:20:30 +09:00
parent 1251c24cdc
commit b76e600c57
21 changed files with 166 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/dbnt/faisp/config/BaseController.java
View File

@ -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;
}

2
src/main/java/com/dbnt/faisp/config/FaispInterceptor.java
View File

@ -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();

4
src/main/java/com/dbnt/faisp/config/ModalController.java
View File

@ -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();

26
src/main/java/com/dbnt/faisp/kwms/KwmsController.java
View File

@ -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;
}

11
src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java
View File

@ -59,11 +59,12 @@ public class CodeMgtService{
return categoryMap;
}
public List<CodeMgt> selectCodeMgtList(String categoryCd, String orderBy) {
List<CodeMgt> codeList = codeMgtRepository.findByCategoryCdAndUseChkOrderByItemCdAsc(categoryCd, "T");
if(orderBy.equals("reverse")){
codeList.sort((o1, o2) -> o2.getItemCd().compareTo(o1.getItemCd()));
}
public List<CodeMgt> selectCodeMgtList(String categoryCd) {
return codeMgtRepository.findByCategoryCdAndUseChkOrderByItemCdAsc(categoryCd, "T");
}
public List<CodeMgt> selectCodeMgtListOrderByDesc(String categoryCd){
List<CodeMgt> codeList = selectCodeMgtList(categoryCd);
codeList.sort((o1, o2) -> o2.getItemCd().compareTo(o1.getItemCd()));
return codeList;
}
public String searchCodeToCategoryAndValue(String categoryCd, String value){

2
src/main/java/com/dbnt/faisp/main/faRpt/FaRptController.java
View File

@ -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;
}

36
src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java
View File

@ -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;
}
}

2
src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java
View File

@ -124,7 +124,7 @@ public class InternationalCrimeArrestController {
}
public List<OrganConfig> selectOrganList(){
List<CodeMgt> organCdList = codeMgtService.selectCodeMgtList("OG", "");
List<CodeMgt> organCdList = codeMgtService.selectCodeMgtList("OG");
List<OrganConfig> organConfigList = organConfigService.selectSavedOrganList();
for(CodeMgt organCode: organCdList){
if(!organCode.getItemCd().equals("OG001")){

4
src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java
View File

@ -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;
}

8
src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java
View File

@ -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")

2
src/main/java/com/dbnt/faisp/main/fpiMgt/sri/SriController.java
View File

@ -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;
}

6
src/main/java/com/dbnt/faisp/main/menuMgt/MenuMgtController.java
View File

@ -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;
}

2
src/main/java/com/dbnt/faisp/main/organMgt/OrganConfigController.java
View File

@ -28,7 +28,7 @@ public class OrganConfigController {
@GetMapping("/selectOrganList")
public List<OrganConfig> selectOrganList(){
List<CodeMgt> organCdList = codeMgtService.selectCodeMgtList("OG", "");
List<CodeMgt> organCdList = codeMgtService.selectCodeMgtList("OG");
List<OrganConfig> organConfigList = organConfigService.selectSavedOrganList();
for(CodeMgt organCode: organCdList){
if(!organCode.getItemCd().equals("OG001")){

2
src/main/java/com/dbnt/faisp/main/publicBoard/PublicBoardController.java
View File

@ -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;
}

17
src/main/java/com/dbnt/faisp/main/userInfo/MyInfoController.java
View File

@ -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();

30
src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java
View File

@ -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<PersonnelStatus> 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<PersonnelStatus> 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;
}

14
src/main/java/com/dbnt/faisp/main/userInfo/UserMgtController.java
View File

@ -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;

18
src/main/resources/mybatisMapper/UserInfoMapper.xml
View File

@ -396,6 +396,24 @@
<if test='viewYn != null and viewYn != ""'>
and a.view_yn = #{viewYn}
</if>
<if test='cat1Cd != null and cat1Cd != ""'>
and b.cat1_cd = #{cat1Cd}
</if>
<if test='cat2Cd != null and cat2Cd != ""'>
and b.cat2_cd = #{cat2Cd}
</if>
<if test='cat3Cd != null and cat3Cd != ""'>
and b.cat3_cd = #{cat3Cd}
</if>
<if test='alarmMsg != null and alarmMsg != ""'>
and a.alarm_msg like '%'||#{alarmMsg}||'%'
</if>
<if test='startDate != null and startDate != ""'>
And a.wrt_dt >= #{startDate}::DATE
</if>
<if test='endDate != null and endDate != ""'>
AND a.wrt_dt &lt;= #{endDate}::DATE+1
</if>
</where>
</sql>
<select id="selectAlarmList" resultType="UserAlarm" parameterType="UserAlarm">

2
src/main/resources/static/css/common.css
View File

@ -70,7 +70,7 @@
/*사이드바 카테고리 트리*/
.btn-toggle:hover, .btn-toggle:focus {
color: rgba(0, 0, 0, .85);
background-color: #d2f4ea;
background-color: #d2eaf4;
}
.btn-toggle::before {
width: 1.25em;

4
src/main/resources/templates/fragments/header.html
View File

@ -74,7 +74,9 @@
</tbody>
<tfoot th:if="${alarmListCnt>10}">
<tr>
<td colspan="2">더보기</td>
<td colspan="2">
<a class="link-dark" href="/myInfo/myAlarm">더보기</a>
</td>
</tr>
</tfoot>
</table>

64
src/main/resources/templates/user/myAlarm.html
View File

@ -2,13 +2,24 @@
<html lang="ko" xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout/layout}">
<th:block layout:fragment="script">
<script type='text/javascript'>
$(function (){
$("#dateSelectorDiv").datepicker({
format: "yyyy-mm-dd",
language: "ko",
autoclose: true
});
})
</script>
</th:block>
<div layout:fragment="content">
<main class="pt-3">
<h4>수신 알람 목록</h4>
<div class="row mx-0">
<div class="col-12 card">
<div class="card-body">
<form method="get" th:action="@{/myInfo/noticePage}">
<form method="get" th:action="@{/myInfo/myAlarm}">
<input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
<div class="row justify-content-between pe-3 py-1">
<div class="col-auto">
@ -18,15 +29,54 @@
</th:block>
</select>
</div>
<div class="col-auto">
<div class="col-6">
<div class="row justify-content-end">
<div class="col-4">
<div class="input-group w-auto input-daterange" id="dateSelectorDiv">
<input type="text" class="form-control form-control-sm" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
<input type="text" class="form-control form-control-sm" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
<div class="col-10">
<div class="row">
<div class="col-3"></div>
<div class="col-3">
<select class="form-select form-select-sm" name="viewYn">
<option value="">열람여부</option>
<option value="Y" th:selected="${searchParams.viewYn eq 'Y'}">O</option>
<option value="N" th:selected="${searchParams.viewYn eq 'N'}">X</option>
</select>
</div>
<div class="col-6">
<div class="input-group">
<select class="form-select form-select-sm" name="cat1Cd">
<option value="">대분류</option>
<th:block th:each="code:${cat1List}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.cat1Cd}"></option>
</th:block>
</select>
<select class="form-select form-select-sm" name="cat2Cd">
<option value="">중분류</option>
<th:block th:each="code:${cat2List}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.cat2Cd}"></option>
</th:block>
</select>
<select class="form-select form-select-sm" name="cat3Cd">
<option value="">소분류</option>
<th:block th:each="code:${cat3List}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.cat3Cd}"></option>
</th:block>
</select>
</div>
</div>
<div class="col-6 pt-1">
<input type="text" class="form-control form-control-sm" placeholder="메시지" name="alarmMsg" th:value="${searchParams.alarmMsg}">
</div>
<div class="col-6 pt-1">
<div class="input-group w-auto input-daterange" id="dateSelectorDiv">
<input type="text" class="form-control form-control-sm" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
<input type="text" class="form-control form-control-sm" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
</div>
</div>
</div>
</div>
<input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
<div class="col-2 d-grid gap-2">
<input type="submit" class="btn btn-sm btn-primary" id="searchBtn" value="검색">
</div>
</div>
</div>
</div>