diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml index 6dbd61e6..ecfcfbcd 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -274,7 +274,24 @@ SELECT C.CRDN_ID - + + + + + C.CRDN_YMD + C.VHRNO + C.CRDN_STDG_NM + C.CRDN_PLC + C.ATCH_FILE_CNT + C.CRDN_STTS_CD + C.FFNLG_AMT + C.CRDN_INPT_SE_CD + + #{term} + + + + @@ -296,6 +313,8 @@ SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST , COUNT(*) AS CRDN_CNT FROM TB_CRDN C + LEFT OUTER JOIN TB_TEAM_INFO TI ON (C.TEAM_ID = TI.TEAM_ID) + LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) WHERE C.DEL_YN = 'N' AND C.TASK_SE_CD = #{taskSeCd} AND C.VHRNO != '' @@ -310,7 +329,25 @@ SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST AND C.VHRNO = #{vhrno} AND C.CRDN_STTS_CD != '81' - + + + + + C.CRDN_YMD + C.CRDN_INPT_SE_CD + TI.TEAM_NM + C.VHRNO + C.CRDN_STDG_NM + C.CRDN_PLC + C.CRDN_STTS_CD + C.FFNLG_AMT + P.RTPYR_NM + + #{term} + + + + GROUP BY C.VHRNO, C.CRDN_STDG_NM HAVING COUNT(*) = ]]> diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp index 2c48c413..9d4eec97 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp @@ -1,3 +1,3 @@ <%@ 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 diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp index 8a3e3be6..00282104 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp @@ -103,6 +103,8 @@
+ +
@@ -165,20 +167,30 @@ - + - - - + + + - - - - - - - + + + + + + + @@ -233,10 +245,14 @@ - - - - + + + + @@ -264,16 +280,26 @@ - - - - - - - - - - + + + + + + + + + +