From d7c65c67c2c2b7a487b13d179b7c38e475c7495f Mon Sep 17 00:00:00 2001
From: JIWOO <dlwldn1024@iten.co.kr>
Date: Mon, 24 Mar 2025 15:29:41 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=ED=98=91?=
 =?UTF-8?q?=EC=9D=98=ED=9A=8C=20=EC=9C=84=EC=9B=90=20=EA=B8=B0=ED=83=80?=
 =?UTF-8?q?=EC=9D=98=EA=B2=AC=20=EB=B0=8F=20=EB=8F=99=EC=9D=98/=EB=B9=84?=
 =?UTF-8?q?=EB=8F=99=EC=9D=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../disputeResolutionCommittee_sql.xml        | 99 ++++++++++---------
 .../user/trublcfrncmng/trublcfrncmngView.jsp  | 87 +++++++++++-----
 2 files changed, 116 insertions(+), 70 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/disputeResolutionCommittee/disputeResolutionCommittee_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/disputeResolutionCommittee/disputeResolutionCommittee_sql.xml
index ab6c73d7..7715fe2d 100644
--- a/src/main/resources/egovframework/sqlmap/config/mappers/disputeResolutionCommittee/disputeResolutionCommittee_sql.xml
+++ b/src/main/resources/egovframework/sqlmap/config/mappers/disputeResolutionCommittee/disputeResolutionCommittee_sql.xml
@@ -107,36 +107,41 @@
 
 			SELECT 
 					(CASE WHEN A.CONFERENCE_GUBUN = '3601000000' THEN '전체회의'
-			        	WHEN A.CONFERENCE_GUBUN = '3602000000' THEN '소회의'
-			        	WHEN A.CONFERENCE_GUBUN = '3603000000' THEN '분과회의'
-			            ELSE '' END
-			        ) AS CONFERENCE_GUBUN
-			        , A.CONFERENCE_TXT
-			        , A.FIX_DAY
-			        , A.CASE_END
-			        , A.CONFERENCE_NAMES
-			        , A.CONFERENCE_CONTENTS
-			        , A.CONFERENCE_PLACE
-			        , A.LUNCH_CHECK
-			        , (SELECT MEMBER_NAME FROM T_MEMBER WHERE MEMBER_ID = A.REG_ID) AS MEMBER_NAME
-			        , (SELECT MEMBER_TEL FROM T_MEMBER WHERE MEMBER_ID = A.REG_ID) AS MEMBER_TEL
-			        , B.CFRNC_NO
-			        , B.MEMBER_NO
-			        , B.ATTENDANCE_CHECK
-			        , A.CASE_GUBUN
-			        , B.CHK
-			        , B.ATTEND_CHECK
-			        , A.CONFERENCE_SIGN_YN
-			        , (SELECT COUNT(*) FROM C_ENDJOSU C WHERE C.CFRNC_NO = A.CFRNC_NO) AS JOSU_CNT
-                    , (SELECT COUNT(*) FROM C_ENDJOSU_SIGN D WHERE D.CFRNC_NO = A.CFRNC_NO AND D.MEMBER_NO = B.MEMBER_NO) AS JOSU_SIGN_CNT
-                    , (SELECT COUNT(*) FROM C_CFRNCATNDNC_AGREE E WHERE E.CFRNC_NO = A.CFRNC_NO AND E.MEMBER_NO = B.MEMBER_NO) AS AGREE_CNT
-			  FROM C_CFRNCMANAGE A, 
-			       C_CFRNCATNDNC B 
-			 WHERE A.CFRNC_NO = B.CFRNC_NO(+) 
-			       AND A.CASE_GUBUN = B.CASE_GUBUN(+)
-			       AND B.MEMBER_NO = #{memberIdx}
-					AND TO_DATE(SUBSTR(FIX_DAY,1,10), 'YYYY-MM-DD') >= TO_DATE(#{startDt}, 'YYYY-MM-DD')-7
- 					AND TO_DATE(SUBSTR(FIX_DAY,1,10), 'YYYY-MM-DD') <= TO_DATE(#{endDt}, 'YYYY-MM-DD')+7
+						WHEN A.CONFERENCE_GUBUN = '3602000000' THEN '소회의'
+						WHEN A.CONFERENCE_GUBUN = '3603000000' THEN '분과회의'
+						ELSE '' END
+					) AS CONFERENCE_GUBUN
+					, A.CONFERENCE_TXT
+					, A.FIX_DAY
+					, A.CASE_END
+					, A.CONFERENCE_NAMES
+					, A.CONFERENCE_CONTENTS
+					, A.CONFERENCE_PLACE
+					, A.LUNCH_CHECK
+					, (SELECT MEMBER_NAME FROM T_MEMBER WHERE MEMBER_ID = A.REG_ID) AS MEMBER_NAME
+					, (SELECT MEMBER_TEL FROM T_MEMBER WHERE MEMBER_ID = A.REG_ID) AS MEMBER_TEL
+					, B.CFRNC_NO
+					, B.MEMBER_NO
+					, B.ATTENDANCE_CHECK
+					, A.CASE_GUBUN
+					, B.CHK
+					, B.ATTEND_CHECK
+					, A.CONFERENCE_SIGN_YN
+					, (SELECT COUNT(*) FROM C_ENDJOSU C WHERE C.CFRNC_NO = A.CFRNC_NO) AS JOSU_CNT
+					, (SELECT COUNT(*) FROM C_ENDJOSU_SIGN D WHERE D.CFRNC_NO = A.CFRNC_NO AND D.MEMBER_NO = B.MEMBER_NO) AS JOSU_SIGN_CNT
+					, C.SEQ_NO
+					, C.AGREE_CHECK
+					, C.OTHER_COMMENTS
+			FROM C_CFRNCMANAGE A
+			LEFT JOIN C_CFRNCATNDNC B
+				ON A.CFRNC_NO = B.CFRNC_NO
+				AND A.CASE_GUBUN = B.CASE_GUBUN
+			LEFT JOIN C_CFRNCATNDNC_AGREE C
+				ON C.CFRNC_NO = A.CFRNC_NO
+				AND C.MEMBER_NO = B.MEMBER_NO
+			 WHERE B.MEMBER_NO = #{memberIdx}
+				AND TO_DATE(SUBSTR(FIX_DAY,1,10), 'YYYY-MM-DD') >= TO_DATE(#{startDt}, 'YYYY-MM-DD')-7
+ 				AND TO_DATE(SUBSTR(FIX_DAY,1,10), 'YYYY-MM-DD') <= TO_DATE(#{endDt}, 'YYYY-MM-DD')+7
 		]]>
 					<!-- AND TO_DATE(FIX_DAY, 'YYYY-MM-DD hh:mi') >= TO_DATE(#{startDt}, 'YYYY-MM-DD hh:mi')-7
 					AND TO_DATE(FIX_DAY, 'YYYY-MM-DD hh:mi') <= TO_DATE(#{endDt}, 'YYYY-MM-DD hh:mi')+7 -->
@@ -291,21 +296,23 @@
 	<insert id="disputeResolutionCommitteeAgree" parameterType="seed.com.user.login.service.DisputeResolutionCommitteeVO" useGeneratedKeys="false">
 		
 		INSERT 
-		  INTO C_CFRNCATNDNC_AGREE 
-		       ( 
-		           SEQ_NO,
-		           CFRNC_NO,
-		           MEMBER_NO,
-		           AGREE_CHECK,
-		           REG_DT 
-		       ) 
-		       VALUES 
-		       ( 
-		           C_CFRNCATNDNC_AGREE_SEQ.NEXTVAL,
-		           #{cfrncNo}, 
-		           #{memberIdx},
-		           'Y',
-		           SYSDATE 
-		       )
+		INTO C_CFRNCATNDNC_AGREE 
+			( 
+				SEQ_NO,
+				CFRNC_NO,
+				MEMBER_NO,
+				AGREE_CHECK,
+				REG_DT,
+				OTHER_COMMENTS
+			) 
+			VALUES 
+			( 
+				C_CFRNCATNDNC_AGREE_SEQ.NEXTVAL,
+				#{cfrncNo}, 
+				#{memberIdx},
+				#{agreeCheck},
+				SYSDATE ,
+				#{otherComments}
+			)
 	</insert>
 </mapper>
\ No newline at end of file
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 dc7a626d..12d84d5d 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
@@ -125,11 +125,13 @@
 		<input type="hidden" name="caseGubun" id="caseGubun" value=""/>
 		<input type="hidden" name="chk" id="chk" value=""/>
         <input type="hidden" name="fileGubuns" id="fileGubuns" value="" />
-        <input type="hidden" id="caseSign" name="caseSign" value=""/>
-        <input type="hidden" id="caseSignName" name="caseSignName" value=""/>
-        <input type="hidden" id="arrCaseList" name="arrCaseList" value=""/>
-        <input type="hidden" id="caseNo" name="caseNo" value=""/>
-        <input type="hidden" id="type" name="type" value=""/>
+        <input type="hidden" name="caseSign" id="caseSign" value=""/>
+        <input type="hidden" name="caseSignName" id="caseSignName" value=""/>
+        <input type="hidden" name="arrCaseList" id="arrCaseList" value=""/>
+        <input type="hidden" name="caseNo" id="caseNo" value=""/>
+        <input type="hidden" name="type" id="type" value=""/>
+        <input type="hidden" name="agreeCheck" id="agreeCheck" value=""/>
+        <input type="hidden" name="otherComments" id="otherComments" value=""/>
 	</form>
 	      
 	<article class="sub_con_wrap date">
@@ -161,18 +163,12 @@
 	        	<a href="/web/user/board/case/law/261/lawList.do" class="btn btn_text gray_fill btn_page_move" target="_blank">법령자료실(바로가기)</a>
 	        </p>
 	        
-	        <div class="clearfix mt30" id="clearfix2">
+	        <div class="clearfix mt30" id="clearfix2" style="display:none;">
 	        	<div class="cont_tit">
 	            	<h4 class="title blue_border orange_border">분쟁조정 협의회 상세</h4>
 	            </div>
-	            <!-- <div class="agreeBtnDiv">
-	            	<button style="text-align:right;" onclick="fn_agree()">동의하기</button>
-	            </div> -->
-	            <div class="agreeTxtDiv">
-	            	<h4 class="title orange_border">동의완료</h4>
-	            	<div class="agreeBtnDiv">
-		            	<button class="btn btn_text darkblue_border btn_agree" onclick="fn_agree()">동의하기</button>
-		            </div>
+	            <div class="beforeAgree">
+	            	<button style="height: 30px; font-size: 15px; padding: 0 10px; background: #fff; border: 1px solid #2435ac; color: #2435ac; float: right; margin-bottom:15px;" onclick="fn_agree()">저장</button>
 	            </div>
 	            <div class="tbl5 table_type_rows">
 					<table cellspacing="0" cellpadding="0" class="">
@@ -186,6 +182,16 @@
 								<th scope="row">회의명</th>
 								<td><span id="conferenceNames"></span></td>
 							</tr>
+							<tr>
+								<th scope="row">동의여부</th>
+								<td class="afterAgree">
+									<span id="conferenceAgreeYn"></span>
+								</td>
+								<td class="beforeAgree">
+									<input type="radio" name="agreeCheckYn" value="Y" id="agreeY" /><label for="agreeY">&nbsp;동의</label>&nbsp;&nbsp;
+									<input type="radio" name="agreeCheckYn" value="N" id="agreeN" /><label for="agreeN">&nbsp;비동의</label>
+								</td>
+							</tr>
 							<tr>
 								<th scope="row">회의구분</th>
 								<td><span id="conferenceGubun"></span></td>
@@ -210,6 +216,15 @@
 								<th scope="row" id="fileList2Txt">첨부자료2</th>
 								<td><span id="fileList2"></span></td>
 							</tr>
+							<tr>
+								<th scope="row" id="fileList2Txt">기타의견</th>
+								<td class="afterAgree">
+									<span id="conferenceComments"></span>
+								</td>
+								<td class="beforeAgree">
+									<textarea rows="10" cols="55" id="comments"></textarea>	
+								</td>
+							</tr>
 						</tbody>
 					</table>
 	            </div>
@@ -350,7 +365,7 @@ function fn_callScheduleData(startDt, endDt){
 	$("#endDt").val(endDt);
 	var param = jQuery('#scheduleFrm').serialize();
 	//url = "/gtm/case/chartMainDash/ajax/ScheduleCheck.do";
-	url = "/user/case/disputeResolutionCommittee/ajax/ScheduleCheck.do";
+	url = "/web/user/case/disputeResolutionCommittee/ajax/ScheduleCheck.do";
 	var arr = [];
 	XHR2(url, param, function(r){
 		if(r.data.length != 0){
@@ -370,7 +385,10 @@ function fn_callScheduleData(startDt, endDt){
 						,"attend" : v.attendCheck
                         ,"etc9" : v.josuCnt
                         ,"etc10" : v.josuSignCnt
-                        ,"etc11" : v.agreeCnt
+                        ,"etc11" : v.seqNo
+                        ,"etc12" : v.agreeCheck
+                        ,"etc13" : v.otherComments
+                        
 					 }
 			});
 		}
@@ -421,9 +439,20 @@ function fn_callScheduleData(startDt, endDt){
 
  function fn_callSelectData(calEvent){
      selectCalEvent = calEvent;
+	 var chkYn = "";
+	 if(calEvent.etc12 == 'Y'){
+		 chkYn = "동의";
+	 }else if(calEvent.etc12 == 'N'){
+		 chkYn = "비동의";
+	 }
+	 
+	 /* 기타의견 줄 바꿈 처리 */
+	 var comments = "";
+	 if(calEvent.etc13 != null){
+	 	comments = calEvent.etc13.replace(/\n/g, '<br>');
+	 }
 	 
 	 $("#clearfix2").show();
-	 
 	//초기화
 	$("#cfrncNo").val("");
 	$("#fileList").html("");
@@ -437,6 +466,8 @@ function fn_callScheduleData(startDt, endDt){
 	$("#conferencePlace").text(calEvent.etc4);
 	$("#regMember").text(calEvent.etc5);
 	$("#regMemberTel").text(calEvent.etc6);
+	$("#conferenceAgreeYn").text(chkYn);
+	$("#conferenceComments").html(comments);
 	if(calEvent.chk == undefined){
 		$("#chk").val("");
 	}else{
@@ -554,12 +585,12 @@ function fn_callScheduleData(startDt, endDt){
         });
     }
 	
-	if(calEvent.etc11 == 0){
-		$(".agreeBtnDiv").show();
-		$(".agreeTxtDiv").hide();
+	if(calEvent.etc11 == null){
+		$(".beforeAgree").show();
+		$(".afterAgree").hide();
 	}else{
-		$(".agreeBtnDiv").hide();
-		$(".agreeTxtDiv").show();
+		$(".beforeAgree").hide();
+		$(".afterAgree").show();
 	}
  }
 
@@ -721,12 +752,20 @@ function checkAll(){
 }
 
 function fn_agree(){
-	if (confirm("해당 안건에 동의하십니까?")) {
+	if (confirm("저장하시겠습니까?")) {
+		var agreeVal = $('input[name="agreeCheckYn"]:checked').val();
+		if(agreeVal == null ){
+			alert("동의여부를 체크해주세요.");
+			return false;
+		}
+		
 		$("#type").val("I");
+		$("#agreeCheck").val(agreeVal);
+		$("#otherComments").val($("#comments").val());
 		var param = jQuery('#scheduleFrm').serialize();
 		url = "/user/case/disputeResolutionCommittee/ajax/Agree.do";
 		XHR2(url, param, function(r){
-			alert("동의 완료되었습니다.")
+			alert("저장 완료되었습니다.")
 			location.reload();
 		});
 	}