diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java index 29a0b3fe..2d9bb480 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc03Controller.java @@ -24,7 +24,7 @@ public class Cvlc03Controller extends ApplicationController { public class METHOD_URL { public static final String civilComplaintManagementMain = "/010/main.do", - getCivilComplaintList = "/040/list.do" + getCivilComplaintList = "/010/list.do" ; } @@ -42,9 +42,9 @@ public class Cvlc03Controller extends ApplicationController { mav.setViewName("fims/cvlc/cvlc03010-main"); mav.addObject("pageName", "cvlc03010-main"); - Map> commonCodes = getCodesOf("FIM026", "FIM054"); + Map> commonCodes = getCodesOf("FIM022","FIM026", "FIM054"); mav.addObject("FIM054List", commonCodes.get("FIM054")); - addCodes(commonCodes, mav, "FIM026"); + addCodes(commonCodes, mav, "FIM022", "FIM026"); return mav; } diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml index c40c7aea..7850e925 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -87,6 +87,9 @@ SELECT C.CRDN_ID , C.CRDN_ROAD_NM , C.CRDN_PLC , C.VLTN_ID + , (SELECT VLTN_ARTCL + FROM TB_VLTN_INFO + WHERE VLTN_ID = C.VLTN_ID) AS VLTN_ARTCL , C.GPS_X , C.GPS_Y , C.ATCH_FILE_CNT @@ -136,6 +139,10 @@ SELECT C.CRDN_ID , CC.CVLCPT_APLY_CN , CC.CVLCPT_GIST , CC.CVLCPT_PRCS_PIC_NM + , (SELECT TELNO + FROM TB_USER + WHERE USER_ID = CC.CVLCPT_PRCS_PIC + ) AS CVLCPT_PRCS_PIC_TELNO , CC.CVLCPT_PRCS_PRNMNT_DT , CC.CVLCPT_PRCS_CD , CC.CVLCPT_PRCS_SUMRY @@ -163,8 +170,41 @@ INNER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCP LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID AND LE.DEL_YN = 'N') LEFT OUTER JOIN TB_LEVY L ON (C.LEVY_ID = L.LEVY_ID) WHERE C.DEL_YN = 'N' + AND C.TASK_SE_CD = #{taskSeCd} + + AND CC.CVLCPT_RCPT_YMD = ]]> #{schCvlcptRcptYmdFrom} + AND CC.CVLCPT_RCPT_YMD #{schCvlcptRcptYmdTo} + + + AND CC.CVLCPT_PRCS_PIC_NM = #{cvlcptPrcsPicNm} + - + + + + + C.CRDN_REG_SE_CD + CC.CVLCPT_APLCNT_NM + CC.CVLCPT_PRCS_PIC_NM + CC.CVLCPT_PRCS_PIC_TELNO + CC.CVLCPT_RCPT_YMD + CC.CVLCPT_PRCS_PRNMNT_DT + C.CRDN_YMD + C.ATCH_FILE_CNT + CC.CVLCPT_RCPT_NO + CC.CVLCPT_LIST_NO + C.VHRNO + LE.LEVY_EXCL_RSN_CD + C.ETC_CN + + #{term} + + + +AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT('%', #{term}, '%') + + + @@ -197,6 +237,13 @@ SELECT C.CRDN_ID WHERE C.DEL_YN = 'N' AND C.TASK_SE_CD = #{taskSeCd} AND C.CRDN_STTS_CD = '01' + + AND CC.CVLCPT_RCPT_YMD = ]]> #{schCvlcptRcptYmdFrom} + AND CC.CVLCPT_RCPT_YMD #{schCvlcptRcptYmdTo} + + + AND CC.CVLCPT_PRCS_PIC_NM = #{cvlcptPrcsPicNm} + @@ -223,13 +270,6 @@ AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT( - - AND CC.CVLCPT_RCPT_YMD = ]]> #{schCvlcptRcptYmdFrom} - AND CC.CVLCPT_RCPT_YMD #{schCvlcptRcptYmdTo} - - - AND CC.CVLCPT_PRCS_PIC_NM = #{cvlcptPrcsPicNm} - @@ -609,6 +649,11 @@ SELECT C.CRDN_ID AND C.CRDN_REG_SE_CD = '02' AND CC.CVLCPT_PRCS_CD IN ('02','03','04') AND CC.CVLCPT_TRSM_CD = '01' + + AND CC.CVLCPT_RCPT_YMD = ]]> #{schCvlcptRcptYmdFrom} + AND CC.CVLCPT_RCPT_YMD #{schCvlcptRcptYmdTo} + +AND CC.CVLCPT_PRCS_CD = #{cvlcptPrcsCd} @@ -636,11 +681,6 @@ AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT( - - AND CC.CVLCPT_RCPT_YMD = ]]> #{schCvlcptRcptYmdFrom} - AND CC.CVLCPT_RCPT_YMD #{schCvlcptRcptYmdTo} - -AND CC.CVLCPT_PRCS_CD = #{cvlcptPrcsCd} diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp index 2130f80f..986410ac 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp @@ -1,4 +1,511 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -민원 관리 -민원 관리 \ No newline at end of file + +
+
+ 민원관리 +
+
+
+
+ + + + +
+ +
+ +
+ +
+ +
+ +
    +
+
+ + + + +
+
+ +
+ +
+
+
+ +
+
+
+ +
+ + + +
+
+ + + \ No newline at end of file