From 535ba775039111ea56f27869c43040d7e2865e71 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 13 Jan 2025 17:09:41 +0900
Subject: [PATCH] =?UTF-8?q?2025-01-13=2017:09=20=EA=B8=B0=EC=95=88=20?=
 =?UTF-8?q?=EB=82=B4=EC=9A=A9=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../seed/com/gtm/base/GwBaseController.java   | 44 ++++++++++++++++---
 .../trublcfrncmng/trublcfrncmng_sql.xml       |  4 ++
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/main/java/seed/com/gtm/base/GwBaseController.java b/src/main/java/seed/com/gtm/base/GwBaseController.java
index 4a6c3865..4ae365f5 100644
--- a/src/main/java/seed/com/gtm/base/GwBaseController.java
+++ b/src/main/java/seed/com/gtm/base/GwBaseController.java
@@ -2384,7 +2384,7 @@ public class GwBaseController {
 			v_ret	=	v_ret	+	this.receiverHR();
 			
 			//하단본문영역
-			v_ret	=	v_ret	+	this.bodyHeader();
+			//v_ret	=	v_ret	+	this.bodyHeader();
 
 			v_ret	=	v_ret	+"1. 우리 협의회는 귀사(하)가 ";
 			v_ret	=	v_ret	+	this.makeRespondents(p_caseRespondentData);
@@ -4916,10 +4916,35 @@ v_ret	=	this.receiverHeader();
 				ex.printStackTrace();
 			}
 			
+			//회의 일자 ==> 회의 일시
+			String[] a_fixday	=	{"",""};
+			String s_fixday	=	"";
 			
+			String[] a_fixday_2	=	{"","",""};
+			
+			try {
+				s_fixday	=	p_dataA.get("fixDay").toString();
+				a_fixday	=	s_fixday.split(" ");
+				
+				if (a_fixday.length>=2) {
+					a_fixday_2	=	a_fixday[0].split("-");
+					
+					if (a_fixday_2.length>=3) {
+						s_fixday	=	a_fixday_2[0] + "." + 
+										Integer.toString(Integer.parseInt(a_fixday_2[1])) + "." + 
+										Integer.toString(Integer.parseInt(a_fixday_2[2])) + "." + 
+										"(" + p_dataA.get("fixDay2").toString() + ")" + 
+										a_fixday[1];
+						
+					}					
+				}	
+			}catch(Exception ex) {
+				ex.printStackTrace();
+			}
 			
 			if ("1-20".equals(p_jobID)) {
-				v_ret	=	v_ret	+"<br/><br/>1. 회의 일자: "+p_dataA.get("fixDay").toString()+"";
+				//v_ret	=	v_ret	+"<br/><br/>1. 회의 일시: "+p_dataA.get("fixDay").toString()+"";
+				v_ret	=	v_ret	+"<br/><br/>1. 회의 일시: "+s_fixday;				
 				v_ret	=	v_ret	+"<br/>2. 참석 위원: "+p_data1.get("memberCnt").toString()+"("+s_memberNm+")";
 				v_ret	=	v_ret	+"<br/>3. 회의안건";
 				v_ret	=	v_ret	+"<br/>ㅇ 보고사항";
@@ -4949,7 +4974,8 @@ v_ret	=	this.receiverHeader();
 				//v_ret	=	v_ret	+"<br/>2. "+p_dataA.get("conferenceNames").toString()+" 희의자료 1부.  끝.";
 
 			}else if ("2-20".equals(p_jobID)) {
-				v_ret	=	v_ret	+"<br/><br/>1. 회의 일자: "+p_dataA.get("fixDay").toString()+"";
+				//v_ret	=	v_ret	+"<br/><br/>1. 회의 일시: "+p_dataA.get("fixDay").toString()+"";
+				v_ret	=	v_ret	+"<br/><br/>1. 회의 일시: "+s_fixday;
 				v_ret	=	v_ret	+"<br/>2. 참석 위원: "+p_data1.get("memberCnt").toString()+"("+s_memberNm+")";
 				v_ret	=	v_ret	+"<br/>3. 회의안건";
 				v_ret	=	v_ret	+"<br/>ㅇ 보고사항";
@@ -4979,7 +5005,8 @@ v_ret	=	this.receiverHeader();
 				//v_ret	=	v_ret	+"<br/>2. "+p_dataA.get("conferenceNames").toString()+" 희의자료 1부.  끝.";
 
 			}else if ("3-20".equals(p_jobID)) {
-				v_ret	=	v_ret	+"<br/><br/>1. 회의 일자: "+p_dataA.get("fixDay").toString()+"";
+				//v_ret	=	v_ret	+"<br/><br/>1. 회의 일시: "+p_dataA.get("fixDay").toString()+"";
+				v_ret	=	v_ret	+"<br/><br/>1. 회의 일시: "+s_fixday;
 				v_ret	=	v_ret	+"<br/>2. 참석 위원: "+p_data1.get("memberCnt").toString()+"("+s_memberNm+")";
 				v_ret	=	v_ret	+"<br/>3. 회의안건";
 				v_ret	=	v_ret	+"<br/>ㅇ 보고사항";
@@ -5010,7 +5037,8 @@ v_ret	=	this.receiverHeader();
 				
 				
 			}else if ("4-20".equals(p_jobID)) {
-				v_ret	=	v_ret	+"<br/><br/>1. 회의 일자: "+p_dataA.get("fixDay").toString()+"";
+				//v_ret	=	v_ret	+"<br/><br/>1. 회의 일시: "+p_dataA.get("fixDay").toString()+"";
+				v_ret	=	v_ret	+"<br/><br/>1. 회의 일시: "+s_fixday;
 				v_ret	=	v_ret	+"<br/>2. 참석 위원: "+p_data1.get("memberCnt").toString()+"("+s_memberNm+")";
 				v_ret	=	v_ret	+"<br/>3. 회의안건";
 				v_ret	=	v_ret	+"<br/>ㅇ 보고사항";
@@ -5040,7 +5068,8 @@ v_ret	=	this.receiverHeader();
 				//v_ret	=	v_ret	+"<br/>2. "+p_dataA.get("conferenceNames").toString()+" 희의자료 1부.  끝.";
 
 			}else if ("5-20".equals(p_jobID)) {
-				v_ret	=	v_ret	+"<br/><br/>1. 회의 일자: "+p_dataA.get("fixDay").toString()+"";
+				//v_ret	=	v_ret	+"<br/><br/>1. 회의 일시: "+p_dataA.get("fixDay").toString()+"";
+				v_ret	=	v_ret	+"<br/><br/>1. 회의 일시: "+s_fixday;
 				v_ret	=	v_ret	+"<br/>2. 참석 위원: "+p_data1.get("memberCnt").toString()+"("+s_memberNm+")";
 				v_ret	=	v_ret	+"<br/>3. 회의안건";
 				v_ret	=	v_ret	+"<br/>ㅇ 보고사항";
@@ -5070,7 +5099,8 @@ v_ret	=	this.receiverHeader();
 				//v_ret	=	v_ret	+"<br/>2. "+p_dataA.get("conferenceNames").toString()+" 희의자료 1부.  끝.";
 
 			}else if ("6-20".equals(p_jobID)) {
-				v_ret	=	v_ret	+"<br/><br/>1. 회의 일자: "+p_dataA.get("fixDay").toString()+"";
+				//v_ret	=	v_ret	+"<br/><br/>1. 회의 일시: "+p_dataA.get("fixDay").toString()+"";
+				v_ret	=	v_ret	+"<br/><br/>1. 회의 일시: "+s_fixday;
 				v_ret	=	v_ret	+"<br/>2. 참석 위원: "+p_data1.get("memberCnt").toString()+"("+s_memberNm+")";
 				v_ret	=	v_ret	+"<br/>3. 회의안건";
 				v_ret	=	v_ret	+"<br/>ㅇ 보고사항";
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 50418f98..20d8d9e2 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
@@ -758,6 +758,10 @@
 		    CONFERENCE_GUBUN,
 		    LUNCH_CHECK,
 		    FIX_DAY,
+		    CASE 	
+		    	WHEN LENGTH(FIX_DAY)>=10 THEN TO_CHAR(TO_DATE(SUBSTR(FIX_DAY,1,10),'YYYY-MM-DD'),'dy')
+				ELSE ''
+			END	FIX_DAY_2, 
 		    CONFERENCE_PLACE,
 		    CONFERENCE_CONTENTS,
 		    CONFERENCE_TXT,