From 2e5ec16decd34a8a4acb4b6d52f7d7480a4706bc Mon Sep 17 00:00:00 2001 From: leebj Date: Wed, 17 Jul 2024 14:18:29 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80(?= =?UTF-8?q?=EC=84=B8=EC=99=B8=EC=88=98=EC=9E=85=20=EC=A0=84=EC=86=A1=20?= =?UTF-8?q?=EC=83=81=ED=83=9C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cokr/xit/fims/crdn/CrdnQuery.java | 10 ++++++++++ .../sql/mapper/fims/crdn/crdn-list-mapper.xml | 11 +++++++++++ .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 15 +++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index fb834595..f907970e 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -73,6 +73,7 @@ public class CrdnQuery extends CmmnQuery { private String vhrno; private String cvlcptPrcsPicNm; private String teamNm; + private String nxrpSendStts; public String getGridType() { return ifEmpty(gridType, () -> null); @@ -434,4 +435,13 @@ public class CrdnQuery extends CmmnQuery { return self(); } + public String getNxrpSendStts() { + return ifEmpty(nxrpSendStts, () -> null); + } + + public T setNxrpSendStts(String nxrpSendStts) { + this.nxrpSendStts = nxrpSendStts; + return self(); + } + } diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml index f9edc5db..8112e469 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml @@ -151,6 +151,17 @@ AND CA.TOWNG_YN = #{towngYn} AND C.MDFR = #{schRgtrCd} + + + AND C.NXRP_CRDN_LINK_YN = 'N' AND C.ATCH_FILE_CNT != 0 AND C.ATCH_FILE_CNT IS NOT NULL + + + AND C.NXRP_CRDN_LINK_YN = 'Y' + + + AND C.NXRP_CRDN_LINK_YN = 'N' AND (C.ATCH_FILE_CNT = 0 OR C.ATCH_FILE_CNT IS NULL) + + diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index 1a4130ee..7a2eb1c0 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -108,6 +108,20 @@ +
+ +
@@ -383,6 +397,7 @@ $(document).ready(function(){ if(SYS_LINK_INFO = null || SYS_LINK_INFO.NXRP_LINK_YN != 'Y'){ $("#btnSendCrdn--${pageName}").attr("hidden","hidden"); + $("#searchForNxrp--${pageName}").attr("hidden","hidden"); } else { $("#btnSendCrdn--${pageName}").prop("disabled", true); }