From 9a56786da82c3de68269eb68e00222e9ef3f5c75 Mon Sep 17 00:00:00 2001
From: JIWOO <dlwldn1024@iten.co.kr>
Date: Fri, 20 Dec 2024 12:54:32 +0900
Subject: [PATCH] =?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=EA=B4=80=EB=A6=AC=20>=20=EC=B0=B8=EC=97=AC?=
 =?UTF-8?q?=EC=9C=84=EC=9B=90=20=EC=88=98=EC=A0=95=20=EC=8B=9C=20=EA=B8=B0?=
 =?UTF-8?q?=EC=A1=B4=20=EB=8F=99=EC=9D=98=EC=97=AC=EB=B6=80=20=EC=9C=A0?=
 =?UTF-8?q?=EC=A7=80=20=EB=B0=8F=20=ED=98=91=EC=9D=98=ED=9A=8C=EC=9C=84?=
 =?UTF-8?q?=EC=9B=90=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B8=B0=EB=B3=B8=20?=
 =?UTF-8?q?=ED=9A=8C=EC=9D=98=EC=9E=90=EB=A3=8C=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/trublcfrncmng/trublcfrncmng_sql.xml    | 14 ++++++++++++++
 .../user/trublcfrncmng/trublcfrncmngView.jsp       |  2 +-
 .../jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp | 13 +++++++++----
 .../seed/_extra/gtm/trublcfrncmng/reportEdit.jsp   | 13 +++++++++----
 4 files changed, 33 insertions(+), 9 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 56e43f43..e331f8be 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
@@ -649,6 +649,20 @@
 			CFRNC_NO = ${cfrncNo}
 		</where>
 	</delete>
+	
+	<!-- 참여위원 동의기록 삭제 -->
+	<delete id="trublcfrncmngChamAgreeDel" parameterType="egovMap">
+		DELETE FROM C_CFRNCATNDNC_AGREE
+		<where>
+			CFRNC_NO = ${cfrncNo}
+			<if test='arrList neq "" and arrList neq null'>
+				AND MEMBER_NO NOT IN
+					<foreach collection="arrList" item="item" open="(" separator="," close=")">
+						#{item}
+					</foreach>
+			</if>
+		</where>
+	</delete>
 
 	<!-- 경비정산 삭제 -->
 	<delete id="trublcfrncmngCfrncexpensDel" parameterType="egovMap">
diff --git a/src/main/webapp/WEB-INF/jsp/_extra/user/trublcfrncmng/trublcfrncmngView.jsp b/src/main/webapp/WEB-INF/jsp/_extra/user/trublcfrncmng/trublcfrncmngView.jsp
index 5c0c560b..3baabc1c 100644
--- a/src/main/webapp/WEB-INF/jsp/_extra/user/trublcfrncmng/trublcfrncmngView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/_extra/user/trublcfrncmng/trublcfrncmngView.jsp
@@ -510,7 +510,7 @@ function fn_callScheduleData(startDt, endDt){
 		}
 	});
 
-	if(calEvent.chk !=""){
+	if(calEvent.chk !="" && calEvent.chk != null){
 		//추가회의자료
 		url = "/user/case/disputeResolutionCommittee/ajax/FileCheck2.do";
 		XHR2(url, param, function(r){
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp
index ce9d16ea..3438a62d 100644
--- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp
@@ -929,13 +929,18 @@ function regData(){
 			var param = jQuery('#frm').serialize();
 			url = "/gtm/case/trublcfrncmng/ajax/ChamDel.do";
 			XHR2(url, param, function(r){
-				var url = "";
-				$("#type").val("I");
 				$("#arrList").val($("#arrListcham").val());
 				var param = jQuery('#frm').serialize();
-				url = "/gtm/case/trublcfrncmng/ajax/CfrncatndncInsert.do";
+				url = "/gtm/case/trublcfrncmng/ajax/ChamAgreeDel.do"
 				XHR2(url, param, function(r){
-
+					var url = "";
+					$("#type").val("I");
+					/* $("#arrList").val($("#arrListcham").val()); */
+					var param = jQuery('#frm').serialize();
+					url = "/gtm/case/trublcfrncmng/ajax/CfrncatndncInsert.do";
+					XHR2(url, param, function(r){
+	
+					});
 				});
 			});
 		}
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp
index 9db539e7..1019dde6 100644
--- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp
@@ -876,13 +876,18 @@ function regData(){
 			var param = jQuery('#frm').serialize();
 			url = "/gtm/case/trublcfrncmng/ajax/ChamDel.do";
 			XHR2(url, param, function(r){
-				var url = "";
-				$("#type").val("I");
 				$("#arrList").val($("#arrListcham").val());
 				var param = jQuery('#frm').serialize();
-				url = "/gtm/case/trublcfrncmng/ajax/CfrncatndncInsert.do";
+				url = "/gtm/case/trublcfrncmng/ajax/ChamAgreeDel.do"
 				XHR2(url, param, function(r){
-
+					var url = "";
+					$("#type").val("I");
+					/* $("#arrList").val($("#arrListcham").val()); */
+					var param = jQuery('#frm').serialize();
+					url = "/gtm/case/trublcfrncmng/ajax/CfrncatndncInsert.do";
+					XHR2(url, param, function(r){
+	
+					});
 				});
 			});
 		}