Merge branch 'JIWOO'

src/main/java/seed/com/user/login/service/DisputeResolutionCommitteeService.java

@@ -17,6 +17,9 @@ public interface DisputeResolutionCommitteeService{
 	
 	//분쟁위원조정 로그인체크
 	DisputeResolutionCommitteeAttendanceRateVO resolutionCommitteeRate(String memberIdx);
+	
+	//분쟁조정위원 동의여부.
+	boolean resolutionAgree(DisputeResolutionCommitteeVO resultVO) throws IOException, InvocationTargetException, SQLException;
 }
 
 

src/main/java/seed/com/user/login/service/DisputeResolutionCommitteeServiceImpl.java

@@ -37,4 +37,10 @@ public class DisputeResolutionCommitteeServiceImpl implements DisputeResolutionC
 		// TODO Auto-generated method stub
 		return disputeResolutionCommitteeDao.resolutionCommitteeRate(memberIdx);
 	}
+	
+	@Override
+	public boolean resolutionAgree(DisputeResolutionCommitteeVO resultVO)
+			throws IOException, InvocationTargetException, SQLException {
+		return disputeResolutionCommitteeDao.resolutionAgree(resultVO);
+	}
 }

src/main/java/seed/com/user/login/service/DisputeResolutionCommitteeVO.java

@@ -44,6 +44,7 @@ public class DisputeResolutionCommitteeVO implements Serializable{
 	String memberCode;
 	String delYn;
 	String memberIp;
+	String agreeCheck;
 	
 	public String getMemberNo() {
 		return memberNo;
@@ -273,4 +274,11 @@ public class DisputeResolutionCommitteeVO implements Serializable{
 	public void setMemberIp(String memberIp) {
 		this.memberIp = memberIp;
 	}
+	public String getAgreeCheck() {
+		return agreeCheck;
+	}
+	public void setAgreeCheck(String agreeCheck) {
+		this.agreeCheck = agreeCheck;
+	}
+	
 }

src/main/java/seed/dao/DisputeResolutionCommitteeDao.java

@@ -35,4 +35,13 @@ public class DisputeResolutionCommitteeDao {
 	}
 	
 	
+	public boolean resolutionAgree(DisputeResolutionCommitteeVO resultVO){
+		int dmlCnt = sqlSession.insert("disputeResolutionCommittee.resolutionAgree", resultVO);
+		if(dmlCnt>0){
+			return true;
+		}else{
+			return false;
+		}
+	}
+	
 }

src/main/resources/egovframework/sqlmap/config/mappers/disputeResolutionCommittee/disputeResolutionCommittee_sql.xml

@@ -129,6 +129,7 @@
 			        , 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(+) 
@@ -286,4 +287,25 @@
     <delete id="disputeResolutionCommitteeCfrncSignCancel" parameterType="egovMap">
         DELETE FROM C_ENDJOSU_SIGN WHERE CFRNC_NO = #{cfrncNo} AND CASE_NO = #{caseNo} AND MEMBER_NO = #{memberIdx}
     </delete>
+    
+	<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 
+		       )
+	</insert>
 </mapper>

src/main/webapp/WEB-INF/jsp/_extra/user/trublcfrncmng/trublcfrncmngView.jsp

@@ -123,6 +123,7 @@
         <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=""/>
 	</form>
 	      
 	<article class="sub_con_wrap date">
@@ -153,6 +154,12 @@
 	        
 	        <div class="clearfix" id="clearfix2" style="width: 100%; padding-top: 15px; display: none;">
 	            <h4 class="mgb15 inblock indent disc2">분쟁조정 협의회 상세</h4>
+	            <div class="agreeBtnDiv">
+	            	<button style="text-align:right;" onclick="fn_agree()">동의하기</button>
+	            </div>
+	            <div class="agreeTxtDiv">
+	            	동의완료
+	            </div>
 	            <div class="tbl5">
 					<table cellspacing="0" cellpadding="0" class="">
 						<caption>신청현황 검색폼 : 등록일시, 조정유형, 제목, 처리상태</caption>
@@ -192,7 +199,7 @@
 						</tbody>
 					</table>
 	            </div>
-                <div class="josuDiv">
+                <!-- <div class="josuDiv">
                     <h4 class="mgt25 mgb15 inblock indent disc2">조정조서 날인대상 목록</h4>
                     <p style="line-height: 15px; font-size: 12px;">당사자가 수락하여 조정조서를 작성중인 사건 목록입니다.<br/>
                         지난회차에 참석하신 협의회 위원님들께서는 전자서명(날인)하여 주시기 바랍니다.<br/>
@@ -218,7 +225,7 @@
                             </tbody>
                         </table>
                     </div>
-                </div>
+                </div> -->
 	            <div class="pat20 pab20 tbl5 meet_lg_noti">
 	                <p>* 분쟁조정실 <span id="regMember"></span>, <span id="regMemberTel"></span></p>
 	            </div>
@@ -349,6 +356,7 @@ function fn_callScheduleData(startDt, endDt){
 						,"attend" : v.attendCheck
                         ,"etc9" : v.josuCnt
                         ,"etc10" : v.josuSignCnt
+                        ,"etc11" : v.agreeCnt
 					 }
 			});
 		}
@@ -531,6 +539,14 @@ function fn_callScheduleData(startDt, endDt){
             }
         });
     }
+	
+	if(calEvent.etc11 == 0){
+		$(".agreeBtnDiv").show();
+		$(".agreeTxtDiv").hide();
+	}else{
+		$(".agreeBtnDiv").hide();
+		$(".agreeTxtDiv").show();
+	}
  }
 
 function fn_cfrncSign(){
@@ -690,6 +706,17 @@ function checkAll(){
     }
 }
 
+function fn_agree(){
+	if (confirm("해당 안건에 동의하십니까?")) {
+		$("#type").val("I");
+		var param = jQuery('#scheduleFrm').serialize();
+		url = "/user/case/disputeResolutionCommittee/ajax/Agree.do";
+		XHR2(url, param, function(r){
+			alert("동의 완료되었습니다.")
+			location.reload();
+		});
+	}
+}
 </script>
 	</body>
 </html>