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 1ae77795..4212a945 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml @@ -156,7 +156,7 @@ SELECT C.CRDN_ID , C.CRDN_REG_SE_CD , 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 , CC.CVLCPT_RCPT_YMD , CC.CVLCPT_PRCS_PRNMNT_DT , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM @@ -169,6 +169,7 @@ SELECT C.CRDN_ID INNER JOIN TB_CRDN_CVLCPT CC ON (C.CRDN_ID = CC.CRDN_ID) WHERE C.DEL_YN = 'N' AND C.TASK_SE_CD = #{taskSeCd} + AND C.CRDN_STTS_CD = '01' @@ -184,7 +185,7 @@ SELECT C.CRDN_ID , (SELECT VLTN_ARTCL FROM TB_VLTN_INFO WHERE VLTN_ID = C.VLTN_ID) ASVLTN_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 , CC.CVLCPT_RCPT_YMD , CC.CVLCPT_PRCS_PRNMNT_DT , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM @@ -197,6 +198,9 @@ SELECT C.CRDN_ID LEFT OUTER JOIN TB_LEVY_EXCL LE ON (C.CRDN_ID = LE.CRDN_ID) WHERE C.DEL_YN = 'N' AND C.TASK_SE_CD = #{taskSeCd} + AND C.CRDN_STTS_CD IN ('21','81','83') + AND C.CRDN_REG_SE_CD = '02' + AND CC.CVLCPT_PRCS_CD IN ('02','03','04') 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 3b1bfff5..f9e100f7 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml @@ -270,7 +270,7 @@ SELECT C.CRDN_ID - + AND OVTIME_YN = 'N' 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 8b504e03..7b54cea2 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 @@ -95,7 +95,7 @@ {CRDN_REG_SE_CD} {CVLCPT_APLCNT_NM} {CVLCPT_PRCS_PIC_NM} - {담당자전화번호} + {CVLCPT_PRCS_PIC_TELNO} {CVLCPT_RCPT_YMD} {CVLCPT_PRCS_PRNMNT_DT} {CRDN_YMD_TM} 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 3951a672..2dcdc8ff 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 @@ -99,7 +99,7 @@ {ASVLTN_ARTCL} {CVLCPT_APLCNT_NM} {CVLCPT_PRCS_PIC_NM} - {담당자전화번호} + {CVLCPT_PRCS_PIC_TELNO} {CVLCPT_RCPT_YMD} {CVLCPT_PRCS_PRNMNT_DT} {CRDN_YMD_TM}