diff --git a/src/main/java/geoinfo/regi/status/RegiController.java b/src/main/java/geoinfo/regi/status/RegiController.java index cf1f515f..abd612ae 100644 --- a/src/main/java/geoinfo/regi/status/RegiController.java +++ b/src/main/java/geoinfo/regi/status/RegiController.java @@ -1766,13 +1766,16 @@ public class RegiController { ModelAndView mav, HttpServletRequest request, HttpServletResponse response)throws Exception { LOGGER.info("세션 아이디 : " + request.getSession().getAttribute("USERID") + " params userid : " + params.get("USER_ID")); + ArrayList MODI_ITEM_LIST = new ArrayList<>(); // "수정요청 대상" 관리자가 체크한 항목 조회 if(request.getSession().getAttribute("USERID").equals(params.get("USER_ID"))) { mav.setViewName("web/manage/select_modeify_call_reason"); EgovMap result = masterService.selectModeifyCallReason(params); + MODI_ITEM_LIST = masterService.selectModifyItemBitmask(params); mav.addObject("result", result); + mav.addObject("modiItem", MODI_ITEM_LIST); } return mav; } diff --git a/src/main/java/geoinfo/regi/status/service/RegiPageMapper.java b/src/main/java/geoinfo/regi/status/service/RegiPageMapper.java index 28c9b101..e629b409 100644 --- a/src/main/java/geoinfo/regi/status/service/RegiPageMapper.java +++ b/src/main/java/geoinfo/regi/status/service/RegiPageMapper.java @@ -194,4 +194,6 @@ public interface RegiPageMapper { public ArrayList> getHoleNamesByProjectCode(HashMap params) throws Exception; List getInputdateRangeByUserid(Map params) throws Exception; + + public ArrayList selectModifyItemBitmask(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/regi/status/service/RegiPageService.java b/src/main/java/geoinfo/regi/status/service/RegiPageService.java index 8513dcc0..a82570f3 100644 --- a/src/main/java/geoinfo/regi/status/service/RegiPageService.java +++ b/src/main/java/geoinfo/regi/status/service/RegiPageService.java @@ -199,4 +199,6 @@ public interface RegiPageService { public int deleteOldDatas(HashMap params) throws Exception; List getInputdateRangeByUserid(Map params) throws Exception; + + public ArrayList selectModifyItemBitmask(HashMap params) throws Exception; } diff --git a/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java b/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java index a41d59f1..f9b62dce 100644 --- a/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java +++ b/src/main/java/geoinfo/regi/status/service/impl/RegiPageServiceImpl.java @@ -500,4 +500,10 @@ public class RegiPageServiceImpl implements RegiPageService { public List getInputdateRangeByUserid(Map params) throws Exception { return regiPageMapper.getInputdateRangeByUserid(params); } + + @Override + public ArrayList selectModifyItemBitmask(HashMap params) throws Exception { + return regiPageMapper.selectModifyItemBitmask(params); + } + } diff --git a/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml b/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml index de3164c9..4821ce45 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/regi/regi.xml @@ -31,12 +31,19 @@ DECODE(A.STATE,'4','insert','5','insert','') AS INS, DECODE(A.STATE,'4','delete','') AS DEL, DECODE(A.STATE,'5','true','false') AS CURSOR, - B.SMS_MSG - FROM TEMP_PROJECT_INFO A, TEMP_SMS_LOG B + B.SMS_MSG, + ST.MODIFY_ITEM + FROM TEMP_PROJECT_INFO A + LEFT JOIN (SELECT * + FROM (SELECT L.* + ,ROW_NUMBER() OVER (PARTITION BY PROJECT_CODE ORDER BY REG_DATE DESC) AS RN + FROM TEMP_SMS_LOG L) + WHERE RN = 1) B ON A.PROJECT_CODE = B.PROJECT_CODE + LEFT JOIN TEMP_MANAGE_STATE ST ON ST.PROJECT_CODE = A.PROJECT_CODE + AND ST.STATE = '5' WHERE - NVL(A.USE_YN,' ') <> 'N' AND A.USERID = #{userId} AND - A.PROJECT_CODE = B.PROJECT_CODE (+) + NVL(A.USE_YN,' ') <> 'N' AND A.USERID = #{userId} ]]> @@ -1410,8 +1417,11 @@ INSERT INTO TEMP_SMS_LOG ( @@ -1440,4 +1450,17 @@ INSERT INTO TEMP_SMS_LOG ( AND tmi.REPORT_TYPE = 'CH' + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/web/index.jsp b/src/main/webapp/WEB-INF/views/web/index.jsp index 13007fc0..a95bd04f 100644 --- a/src/main/webapp/WEB-INF/views/web/index.jsp +++ b/src/main/webapp/WEB-INF/views/web/index.jsp @@ -119,9 +119,11 @@ function delBtnClick(report_type, project_code) { // 수정 버튼 -function msgBtnTemplate(report_type, project_code, message){ +// function msgBtnTemplate(report_type, project_code, message){ +function msgBtnTemplate(report_type, project_code, modify_item, message){ if (msg = "message"){ - return ''; +// return ''; + return ''; } else{ return " "; @@ -129,11 +131,11 @@ function msgBtnTemplate(report_type, project_code, message){ } //수정요청 클릭 -function selectModifycallBtnClick(projectCode, createUserid) { +function selectModifycallBtnClick(projectCode, createUserid, modifyItem) { var url = "/selectModeifyCallReason.do"; - var param = "PROJECT_CODE=" + projectCode + "&USER_ID=" + createUserid; + var param = "PROJECT_CODE=" + projectCode + "&USER_ID=" + createUserid + "&MODIFY_ITEM=" + modifyItem; - fn_openPopup(url, param, '480', '330'); + fn_openPopup(url, param, '480', '665'); } @@ -199,7 +201,8 @@ function kendoGrid() { field: "message", width: 70, title: "요청사항", - template: "#if (data.smsMsg != '') {#
#= msgBtnTemplate(data.projectCode, data.userid) #
#}#" +// template: "#if (data.smsMsg != '') {#
#= msgBtnTemplate(data.projectCode, data.userid) #
#}#" + template: "#if (data.state == '5') {#
#= msgBtnTemplate(data.projectCode, data.userid, data.modifyItem) #
#}#" }, { field: "excelUpload", diff --git a/src/main/webapp/WEB-INF/views/web/manage/select_modeify_call_reason.jsp b/src/main/webapp/WEB-INF/views/web/manage/select_modeify_call_reason.jsp index 9ddc60d9..1878d8ad 100644 --- a/src/main/webapp/WEB-INF/views/web/manage/select_modeify_call_reason.jsp +++ b/src/main/webapp/WEB-INF/views/web/manage/select_modeify_call_reason.jsp @@ -11,6 +11,83 @@ +