이지우 - 사용자 분쟁조정 신청, 임시보관 기능 완료

src/main/java/seed/com/user/dao/MediationDao.java

@@ -23,6 +23,7 @@ public interface MediationDao {
 	public void rceUpdate(Map<String,Object> paramMap);
 	public void subCntrUpdate(Map<String,Object> paramMap);
 	public void subCntrDelete(Map<String,Object> paramMap);
+	public void subCntrAllDelete(Map<String,Object> paramMap);
 	public void reasonUpdate(Map<String,Object> paramMap);
 	public void reasonDelete(Map<String,Object> paramMap);
 	public Map<String,Object> masterList(Map<String,Object> paramMap);

src/main/java/seed/com/user/dao/MediationDaoImpl.java

@@ -107,6 +107,11 @@ public class MediationDaoImpl implements MediationDao {
 		sqlSession.delete("mediation.subCntrDelete", paramMap);
 	}
 	
+	@Override
+	public void subCntrAllDelete(Map<String, Object> paramMap) {
+		sqlSession.delete("mediation.subCntrAllDelete", paramMap);
+	}
+
     @Override
     public void reasonUpdate(Map<String, Object> paramMap) {
         sqlSession.update("mediation.reasonUpdate", paramMap);

src/main/java/seed/com/user/mediation/MediationService.java

@@ -89,6 +89,10 @@ public class MediationService {
 		dao.subCntrDelete(paramMap);
 	}
 	
+	public void subCntrAllDelete(Map<String, Object> paramMap){
+		dao.subCntrAllDelete(paramMap);
+	}
+
 	public void reasonUpdate(Map<String, Object> paramMap){
 		dao.reasonUpdate(paramMap);
 	}

src/main/java/seed/com/user/mediation/WebMediationController.java

@@ -1953,7 +1953,7 @@ public class WebMediationController {
 
 					
 					if(i <= existRSubCntrData){
-						paramMap.put("seqNo", SeedUtils.setReplaceNull(paramMap.get("subCntrSeqNoB_"+i)));
+						paramMap.put("seqNo", SeedUtils.setReplaceNull(paramMap.get("subCntrSeqNoR_"+i)));
 						service.subCntrUpdate(paramMap);
 					}else{
 						service.subCntrInsert(paramMap);
@@ -2722,7 +2722,7 @@ public class WebMediationController {
 
 					
 					if(i <= existRSubCntrData){
-						paramMap.put("seqNo", SeedUtils.setReplaceNull(paramMap.get("subCntrSeqNoB_"+i)));
+						paramMap.put("seqNo", SeedUtils.setReplaceNull(paramMap.get("subCntrSeqNoR_"+i)));
 						service.subCntrUpdate(paramMap);
 					}else{
 						service.subCntrInsert(paramMap);
@@ -3726,6 +3726,9 @@ public class WebMediationController {
 				}
 				/*end*/
 				
+				//임시저장 후 저장 시 중복 insert 문제로 업데이트가 아닌 일괄 삭제 후 재등록 처리
+				service.subCntrAllDelete(paramMap);
+				
 				String tempaCnt = SeedUtils.setReplaceNull(paramMap.get("aCnt"));
 				String tempExistASubCntrData = SeedUtils.setReplaceNull(paramMap.get("existASubCntrData"));
 				int aCnt = 0;
@@ -3750,6 +3753,20 @@ public class WebMediationController {
 					paramMap.put("subCntrTotAmount", SeedUtils.setReplaceNull(paramMap.get("subCntrTotAmount_"+i)).toString().replaceAll(",", ""));
 					paramMap.put("subCntrNonPayment", SeedUtils.setReplaceNull(paramMap.get("subCntrNonPayment_"+i)).toString().replaceAll(",", ""));
 					paramMap.put("subCntrNote", SeedUtils.setReplaceNull(paramMap.get("subCntrNote_"+i)));
+					service.subCntrInsert(paramMap);
+				}
+				/*for(int i = 1; i <= aCnt; i++){
+					paramMap.put("subCntrCubun", SeedUtils.setReplaceNull(paramMap.get("subCntrCubun_"+i)));
+					paramMap.put("subCntrDt", SeedUtils.setReplaceNull(paramMap.get("subCntrDt_"+i)));
+					paramMap.put("subCntrSttAmount", SeedUtils.setReplaceNull(paramMap.get("subCntrAmount_"+i)).toString().replaceAll(",", ""));
+					paramMap.put("subCntrCashDt", SeedUtils.setReplaceNull(paramMap.get("subCntrCashDt_"+i)));
+					paramMap.put("subCntrCashAmount", SeedUtils.setReplaceNull(paramMap.get("subCntrCashAmount_"+i)).toString().replaceAll(",", ""));
+					paramMap.put("subCntrBillPayDay", SeedUtils.setReplaceNull(paramMap.get("subCntrBillPayDay_"+i)));
+					paramMap.put("subCntrBillLimit", SeedUtils.setReplaceNull(paramMap.get("subCntrBillLimit_"+i)));
+					paramMap.put("subCntrBillAmount", SeedUtils.setReplaceNull(paramMap.get("subCntrBillAmount_"+i)).toString().replaceAll(",", ""));
+					paramMap.put("subCntrTotAmount", SeedUtils.setReplaceNull(paramMap.get("subCntrTotAmount_"+i)).toString().replaceAll(",", ""));
+					paramMap.put("subCntrNonPayment", SeedUtils.setReplaceNull(paramMap.get("subCntrNonPayment_"+i)).toString().replaceAll(",", ""));
+					paramMap.put("subCntrNote", SeedUtils.setReplaceNull(paramMap.get("subCntrNote_"+i)));
 					
 					if(i <= existASubCntrData){
 						paramMap.put("seqNo", SeedUtils.setReplaceNull(paramMap.get("subCntrSeqNoA_"+i)));
@@ -3757,7 +3774,7 @@ public class WebMediationController {
 					}else{
 						service.subCntrInsert(paramMap);
 					}
-				}
+				}*/
 				
 				String temprCnt = SeedUtils.setReplaceNull(paramMap.get("rCnt"));
 				String tempExistRSubCntrData = SeedUtils.setReplaceNull(paramMap.get("existRSubCntrData"));
@@ -3783,15 +3800,29 @@ public class WebMediationController {
 					paramMap.put("subCntrTotAmount", SeedUtils.setReplaceNull(paramMap.get("r_subCntrTotAmount_"+i)).toString().replaceAll(",", ""));
 					paramMap.put("subCntrNonPayment", SeedUtils.setReplaceNull(paramMap.get("r_subCntrNonPayment_"+i)).toString().replaceAll(",", ""));
 					paramMap.put("subCntrNote", SeedUtils.setReplaceNull(paramMap.get("r_subCntrNote_"+i)));
+					service.subCntrInsert(paramMap);
+				}
+				/*for(int i = 1; i <= rCnt; i++){
+					paramMap.put("subCntrCubun", SeedUtils.setReplaceNull(paramMap.get("r_subCntrCubun_"+i)));
+					paramMap.put("subCntrDt", SeedUtils.setReplaceNull(paramMap.get("r_subCntrDt_"+i)));
+					paramMap.put("subCntrSttAmount", SeedUtils.setReplaceNull(paramMap.get("r_subCntrAmount_"+i)).toString().replaceAll(",", ""));
+					paramMap.put("subCntrCashDt", SeedUtils.setReplaceNull(paramMap.get("r_subCntrCashDt_"+i)));
+					paramMap.put("subCntrCashAmount", SeedUtils.setReplaceNull(paramMap.get("r_subCntrCashAmount_"+i)).toString().replaceAll(",", ""));
+					paramMap.put("subCntrBillPayDay", SeedUtils.setReplaceNull(paramMap.get("r_subCntrBillPayDay_"+i)));
+					paramMap.put("subCntrBillLimit", SeedUtils.setReplaceNull(paramMap.get("r_subCntrBillLimit_"+i)));
+					paramMap.put("subCntrBillAmount", SeedUtils.setReplaceNull(paramMap.get("r_subCntrBillAmount_"+i)).toString().replaceAll(",", ""));
+					paramMap.put("subCntrTotAmount", SeedUtils.setReplaceNull(paramMap.get("r_subCntrTotAmount_"+i)).toString().replaceAll(",", ""));
+					paramMap.put("subCntrNonPayment", SeedUtils.setReplaceNull(paramMap.get("r_subCntrNonPayment_"+i)).toString().replaceAll(",", ""));
+					paramMap.put("subCntrNote", SeedUtils.setReplaceNull(paramMap.get("r_subCntrNote_"+i)));
 					
 					
 					if(i <= existRSubCntrData){
-						paramMap.put("seqNo", SeedUtils.setReplaceNull(paramMap.get("subCntrSeqNoB_"+i)));
+						paramMap.put("seqNo", SeedUtils.setReplaceNull(paramMap.get("subCntrSeqNoR_"+i)));
 						service.subCntrUpdate(paramMap);
 					}else{
 						service.subCntrInsert(paramMap);
 					}
-				}
+				}*/
 				
 				if("0".equals(paramMap.get("reaseonCnt")) && !"Y".equals(paramMap.get("reaseonYn"))) {
 					service.reasonInsert(paramMap);

src/main/resources/egovframework/sqlmap/config/mappers/mediation/mediation_sql.xml

@@ -361,16 +361,11 @@
 			<if test="caseGubun != null and caseGubun != ''">
 			CASE_GUBUN = #{caseGubun},
 			</if>
-			<if test="caseReason1 != null and caseReason1 != ''">
 			CASE_REASON1 = #{caseReason1},
-			</if>
-			<if test="caseReason2 != null and caseReason2 != ''">
 			CASE_REASON2 = #{caseReason2},
-			</if>
-			<if test="caseReason3 != null and caseReason3 != ''">
 			CASE_REASON3 = #{caseReason3},
-			</if>
 			REQUEST_CHECK = #{requestCheck},
+			CONSIGNMENT_GUBUN	= #{consignmentGubun},	
 			<if test="requestCheck == '1602000000'">
 			FTC_CHECK = 'N',
 			</if>
@@ -634,6 +629,11 @@
 		WHERE SEQ_NO = #{seqNo}
 	</delete>
 	
+	<delete id="subCntrAllDelete" parameterType="hashMap">
+		DELETE FROM C_SUBCNTRSTTUS
+		WHERE RCEPT_NO = #{rceptNo}
+	</delete>
+
     <update id="reasonUpdate" parameterType="hashMap">
         UPDATE C_APPRESON
         SET

src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04.jsp

@@ -1690,7 +1690,7 @@
 									신청인<c:out value='${sts.index+1}'/> <i class="icon slide up"></i>
 								</button>
 								<c:if test="${not sts.first}">
-									<button type="button" class="btn btn_text btn_35 darkblue_border btn_delete_apl btnDelTabB" title="신청인<c:out value='${sts.index+1}'/> 삭제">신청인 삭제</button>
+									<button type="button" class="btn btn_text btn_35 darkblue_border btn_delete_apl btnDelTabB" title="신청인<c:out value='${sts.index+1}'/> 삭제" onclick="delTabB('<c:out value="${sts.index+1}"/>')">신청인 삭제</button>
 								</c:if>
 							</div>
 							<div class="table_type_rows apl_info_input">

src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_1.jsp

@@ -1218,7 +1218,7 @@
 									피신청인<c:out value='${sts.index+1}'/> <i class="icon slide up"></i>
 								</button>
 								<c:if test="${not sts.first}">
-									<button type="button" class="btn btn_text btn_35 darkblue_border btn_delete_apl" onclick="removeLi(this);" title="피신청인1 삭제">피신청인 삭제</button>
+									<button type="button" class="btn btn_text btn_35 darkblue_border btn_delete_apl" onclick="delTabC('<c:out value="${sts.index+1}"/>')" title="피신청인1 삭제">피신청인 삭제</button>
 								</c:if>
 							</div>
 							<div class="table_type_rows apl_info_input">

src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_3.jsp

@@ -1292,7 +1292,10 @@
 	}
 	
 	function tempAppBtn_step(div){
-
+		//신청 확인사항 직접입력 아닐 시 초기화
+		if($('[name=applyCheck]:checked').val() != '5_3'){
+			$('#applyEtc').val('');
+		}
       	$("#requestCheck").val('1601000000');
 		/* var frmAction = "/web/user/mediation/${siteIdx}/05/${siteMenuIdx}/updateAjax.do"; */
 		var frmAction = "/web/user/mediation/${siteIdx}/05/${siteMenuIdx}/updateAjax04_3.do";
@@ -1309,9 +1312,10 @@
 						alert("임시저장 되었습니다.");
 						//저장 후 이노릭스 파일 정보 초기화 - 임시저장 후 다음단계 이동 시 중복 등록 방지
 						$("#innorixFileListVO").val("");
-						//임시 저장 후 신천 경로
+						//임시 저장 후 신청 경로
 						$("#reaseonYn").val("Y");
 						controlChg = "N";
+						
 					}
 					else{
 						$("#applyForm").submit();

src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_4.jsp

@@ -1281,6 +1281,9 @@ document.addEventListener('DOMContentLoaded', function() {
 	    <input type="hidden" id="existDataCnt" name="existDataCnt" value="${fn:length(respondentData)}">
         <input type="hidden" id="existDataCnt2" name="existDataCnt2" value="${fn:length(applcntData)}">
 	    <input type="hidden" id="presidentAssign" name="presidentAssign" value=""/>
+	    <input type="hidden" id="caseReason1" name="caseReason1" value="${recptmsData.CASE_REASON1}"/>
+	    <input type="hidden" id="caseReason2" name="caseReason2" value="${recptmsData.CASE_REASON2}"/>
+	    <input type="hidden" id="caseReason3" name="caseReason3" value="${recptmsData.CASE_REASON3}"/>
 
 		<!-- page_location -->
 		<ul class="page_location">