From 6af923346cac63f589ac84c32ceff5a89319d0f9 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Wed, 8 Jan 2025 10:17:28 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=ED=98=91?= =?UTF-8?q?=EC=9D=98=ED=9A=8C=20=EA=B0=9C=EC=B5=9C=EC=9D=BC=EC=8B=9C?= =?UTF-8?q?=EC=97=90=20null=20=EC=9E=85=EB=A0=A5=20=EC=8B=9C=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EB=B0=A9=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml index 02915571..8165afc7 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml @@ -1717,7 +1717,7 @@ END AS MEMBER_NAME, (SELECT COUNT(*) FROM C_DLBRTMTR WHERE CASE_GUBUN = A.CASE_GUBUN AND CFRNC_NO = A.CFRNC_NO) AS DLBRTMTR_CNT, (SELECT COUNT(*) FROM C_ENDMTR WHERE CASE_GUBUN = A.CASE_GUBUN AND CFRNC_NO = A.CFRNC_NO) AS ENDMTR_CNT, - FIX_DAY, + REPLACE(FIX_DAY, 'null', '00') AS FIX_DAY, CONFERENCE_PLACE, CASE_GUBUN, (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CASE_GUBUN) AS CASE_GUBUN_NM, @@ -1767,7 +1767,7 @@ AND DEL_YN = 'N' - AND TO_DATE(FIX_DAY, 'YYYY-MM-DD HH24:MI') > SYSDATE + AND TO_DATE(REPLACE(FIX_DAY, 'null', '00'), 'YYYY-MM-DD HH24:MI') > SYSDATE ORDER BY FIX_DAY ASC From 6a3f746da35af624cbcd886e0e89590ff22771c1 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Wed, 8 Jan 2025 11:02:30 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=ED=98=91?= =?UTF-8?q?=EC=9D=98=ED=9A=8C=20=EB=93=B1=EB=A1=9D/=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EC=8B=9C=20=EA=B0=9C=EC=B5=9C=EC=9D=BC=EC=8B=9C=EC=97=90=20nul?= =?UTF-8?q?l=EC=9D=84=2000=EC=9C=BC=EB=A1=9C=20=EB=A6=AC=ED=94=8C=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=8A=A4=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/mappers/trublcfrncmng/trublcfrncmng_sql.xml | 5 +++-- .../WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml index 8165afc7..936e7f2b 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml @@ -439,7 +439,7 @@ #{conferenceGubun}, '0501000000', #{lunchCheck}, - #{fixDay}, + REPLACE(#{fixDay}, 'null', '00'), #{conferencePlace}, SYSDATE, #{memberId}, @@ -731,7 +731,8 @@ , LUNCH_CHECK = #{lunchCheck} - , FIX_DAY = #{fixDay} + + , FIX_DAY = REPLACE(#{fixDay}, 'null', '00') , CONFERENCE_PLACE = #{conferencePlace} diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp index 928bf8c0..d0778910 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyWrite.jsp @@ -549,7 +549,7 @@ function fn_checkList() {
- +
From 1d3f554ce61f3b0b70b21f8aeb686000213af737 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Wed, 8 Jan 2025 11:57:30 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B8=B0?= =?UTF-8?q?=EC=95=88=20=ED=98=B8=EC=B6=9C=EC=8B=9C=20=ED=98=91=EC=9D=98?= =?UTF-8?q?=ED=9A=8C=20=EC=A1=B0=ED=9A=8C=20=EC=BF=BC=EB=A6=AC=20=EC=9B=90?= =?UTF-8?q?=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../seed/com/gtm/base/GwBaseController.java | 2 +- .../trublcfrncmng/trublcfrncmng_sql.xml | 29 ------------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/src/main/java/seed/com/gtm/base/GwBaseController.java b/src/main/java/seed/com/gtm/base/GwBaseController.java index 1bd85c5e..33c67256 100644 --- a/src/main/java/seed/com/gtm/base/GwBaseController.java +++ b/src/main/java/seed/com/gtm/base/GwBaseController.java @@ -552,7 +552,7 @@ public class GwBaseController { params.put("sql", "nanumCfrncmanageSel1"); //사건 정보 - 성립수 params.put("data1", JSPUtil.fixNull(bservice.select(params))); - params.put("sql", "trublcfrncmngCfrncmanageSelForGw"); //사건 정보 - 이름수 + params.put("sql", "trublcfrncmngCfrncmanageSel"); //사건 정보 - 이름수 params.put("dataA", JSPUtil.fixNull(bservice.select(params))); params.put("sql", "trublcfrncmngCfrncatndncSel"); //참여 위원 정보 - 참석자 정보 diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml index 936e7f2b..03f2ebc6 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml @@ -770,35 +770,6 @@ - - -