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 ac2780f0..6d8a1b24 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml @@ -161,7 +161,7 @@ SELECT C.CRDN_ID , CC.CVLCPT_PRCS_PRNMNT_DT , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM , C.ATCH_FILE_CNT - , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) ASVLTN_ARTCL + , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) AS VLTN_ARTCL , CC.CVLCPT_RCPT_NO , C.VHRNO , C.CRDN_PLC @@ -171,7 +171,44 @@ SELECT C.CRDN_ID AND C.TASK_SE_CD = #{taskSeCd} AND C.CRDN_STTS_CD = '01' - + + +AND FN_GET_CODE_NM('FIM026', C.CRDN_REG_SE_CD) LIKE CONCAT('%', #{term}, '%') + + +AND CC.CVLCPT_APLCNT_NM LIKE CONCAT('%', #{term}, '%') + + +AND CC.CVLCPT_PRCS_PIC_NM LIKE CONCAT('%', #{term}, '%') + + +AND CC.CVLCPT_PRCS_PIC_TELNO LIKE CONCAT('%', #{term}, '%') + + +AND CC.CVLCPT_RCPT_YMD = REPLACE(#{term},'-','') + + +AND SUBSTR(CC.CVLCPT_PRCS_PRNMNT_DT,1,8) = REPLACE(#{term},'-','') + + +AND C.CRDN_YMD = REPLACE(#{term},'-','') + + +AND C.ATCH_FILE_CNT = #{term} + + +AND (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) LIKE CONCAT('%', #{term}, '%') + + +AND CC.CVLCPT_RCPT_NO LIKE CONCAT('%', #{term}, '%') + + +AND C.VHRNO LIKE CONCAT('%', #{term}, '%') + + + + + AND CC.CVLCPT_RCPT_YMD = ]]> #{schCvlcptRcptYmdFrom} @@ -189,7 +226,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 + , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) AS VLTN_ARTCL , CC.CVLCPT_APLCNT_NM , CC.CVLCPT_PRCS_PIC_NM , (SELECT TELNO FROM TB_USER WHERE USER_ID = CC.CVLCPT_PRCS_PIC) AS CVLCPT_PRCS_PIC_TELNO @@ -209,7 +246,7 @@ SELECT C.CRDN_ID AND C.CRDN_REG_SE_CD = '02' AND CC.CVLCPT_PRCS_CD IN ('02','03','04') - + AND CC.CVLCPT_RCPT_YMD = ]]> #{schCvlcptRcptYmdFrom} diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml index 8d9b4ddd..3767f5ed 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml @@ -11,7 +11,7 @@ SELECT C.CRDN_ID , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM , C.VHRNO , C.CRDN_PLC - , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) ASVLTN_ARTCL + , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) AS VLTN_ARTCL , C.DEL_YN , C.RGTR , C.REG_DT 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 e2382734..45d31054 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 @@ -77,19 +77,19 @@ - + - - - - - - - - - - - + + + + + + + + + + + @@ -104,7 +104,7 @@ - + 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 027a9d57..9176794b 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 @@ -106,7 +106,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp index 2a495cf6..01084636 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp @@ -76,7 +76,7 @@ - +