diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml index b63a2731..2e4dbc94 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml @@ -157,17 +157,17 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%') /* 민원접수자료 목록 조회(crdn01Mapper.selectCivilComplaintReceiptDataList) */ SELECT C.CRDN_ID - , C.CRDN_REG_SE_CD - , CC.CVLCPT_APLCNT_NM - , CC.CVLCPT_PRCS_PIC_NM + , C.CRDN_REG_SE_CD + , CC.CVLCPT_APLCNT_NM + , CC.CVLCPT_PRCS_PIC_NM - , CC.CVLCPT_RCPT_YMD - , CC.CVLCPT_PRCS_PRNMNT_DT + , CC.CVLCPT_RCPT_YMD + , CC.CVLCPT_PRCS_PRNMNT_DT , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM - , C.ATCH_FILE_CNT - - , CC.CVLCPT_RCPT_NO - , C.VHRNO + , C.ATCH_FILE_CNT + , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) ASVLTN_ARTCL + , CC.CVLCPT_RCPT_NO + , C.VHRNO FROM TB_CRDN C INNER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID) @@ -185,7 +185,7 @@ SELECT C.CRDN_ID SELECT C.CRDN_ID , C.CRDN_REG_SE_CD - + , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) ASVLTN_ARTCL , CC.CVLCPT_APLCNT_NM , CC.CVLCPT_PRCS_PIC_NM diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp index 6a1c39c6..4fb17a06 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp @@ -100,7 +100,7 @@ {CVLCPT_PRCS_PRNMNT_DT} {CRDN_YMD_TM} {ATCH_FILE_CNT} - {위반내용} + {ASVLTN_ARTCL} {CVLCPT_RCPT_NO} {VHRNO} diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp index 91f498ef..51ee8df9 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp @@ -96,7 +96,7 @@ {ROW_NUM} {CRDN_REG_SE_CD} - {위반내용} + {ASVLTN_ARTCL} {CVLCPT_APLCNT_NM} {CVLCPT_PRCS_PIC_NM} {담당자전화번호} diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp index 9d761da3..aef73f35 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp @@ -12,7 +12,7 @@