From a63327b3f3ef1bde200b261ee53da39d3b92c30c Mon Sep 17 00:00:00 2001 From: JIWOO Date: Mon, 2 Dec 2024 17:42:53 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EB=B6=84=EC=9F=81=EC=A1=B0=EC=A0=95=20?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD,=20=EC=9E=84=EC=8B=9C=EB=B3=B4=EA=B4=80=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/seed/com/user/dao/MediationDao.java | 1 + .../seed/com/user/dao/MediationDaoImpl.java | 5 ++ .../com/user/mediation/MediationService.java | 4 ++ .../mediation/WebMediationController.java | 47 +++++++++++++++---- .../mappers/mediation/mediation_sql.xml | 16 +++---- .../web/user/mediation/mediationStep04.jsp | 2 +- .../web/user/mediation/mediationStep04_1.jsp | 2 +- .../web/user/mediation/mediationStep04_3.jsp | 8 +++- .../web/user/mediation/mediationStep04_4.jsp | 3 ++ 9 files changed, 68 insertions(+), 20 deletions(-) diff --git a/src/main/java/seed/com/user/dao/MediationDao.java b/src/main/java/seed/com/user/dao/MediationDao.java index 8ca9b2af..4f73215d 100644 --- a/src/main/java/seed/com/user/dao/MediationDao.java +++ b/src/main/java/seed/com/user/dao/MediationDao.java @@ -23,6 +23,7 @@ public interface MediationDao { public void rceUpdate(Map paramMap); public void subCntrUpdate(Map paramMap); public void subCntrDelete(Map paramMap); + public void subCntrAllDelete(Map paramMap); public void reasonUpdate(Map paramMap); public void reasonDelete(Map paramMap); public Map masterList(Map paramMap); diff --git a/src/main/java/seed/com/user/dao/MediationDaoImpl.java b/src/main/java/seed/com/user/dao/MediationDaoImpl.java index a01b9181..686bffd6 100644 --- a/src/main/java/seed/com/user/dao/MediationDaoImpl.java +++ b/src/main/java/seed/com/user/dao/MediationDaoImpl.java @@ -106,6 +106,11 @@ public class MediationDaoImpl implements MediationDao { public void subCntrDelete(Map paramMap) { sqlSession.delete("mediation.subCntrDelete", paramMap); } + + @Override + public void subCntrAllDelete(Map paramMap) { + sqlSession.delete("mediation.subCntrAllDelete", paramMap); + } @Override public void reasonUpdate(Map paramMap) { diff --git a/src/main/java/seed/com/user/mediation/MediationService.java b/src/main/java/seed/com/user/mediation/MediationService.java index 2a029444..5d7ea837 100644 --- a/src/main/java/seed/com/user/mediation/MediationService.java +++ b/src/main/java/seed/com/user/mediation/MediationService.java @@ -88,6 +88,10 @@ public class MediationService { public void subCntrDelete(Map paramMap){ dao.subCntrDelete(paramMap); } + + public void subCntrAllDelete(Map paramMap){ + dao.subCntrAllDelete(paramMap); + } public void reasonUpdate(Map paramMap){ dao.reasonUpdate(paramMap); diff --git a/src/main/java/seed/com/user/mediation/WebMediationController.java b/src/main/java/seed/com/user/mediation/WebMediationController.java index dd8fac84..e0af9c7d 100644 --- a/src/main/java/seed/com/user/mediation/WebMediationController.java +++ b/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,14 +3753,28 @@ 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))); service.subCntrUpdate(paramMap); }else{ service.subCntrInsert(paramMap); } - } + }*/ String temprCnt = SeedUtils.setReplaceNull(paramMap.get("rCnt")); String tempExistRSubCntrData = SeedUtils.setReplaceNull(paramMap.get("existRSubCntrData")); @@ -3783,16 +3800,30 @@ 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); }else { diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/mediation/mediation_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/mediation/mediation_sql.xml index 071e88cb..6cb4ce0d 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/mediation/mediation_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/mediation/mediation_sql.xml @@ -361,16 +361,11 @@ CASE_GUBUN = #{caseGubun}, - CASE_REASON1 = #{caseReason1}, - - - CASE_REASON2 = #{caseReason2}, - - - CASE_REASON3 = #{caseReason3}, - + CASE_REASON2 = #{caseReason2}, + CASE_REASON3 = #{caseReason3}, REQUEST_CHECK = #{requestCheck}, + CONSIGNMENT_GUBUN = #{consignmentGubun}, FTC_CHECK = 'N', @@ -633,6 +628,11 @@ DELETE FROM C_SUBCNTRSTTUS WHERE SEQ_NO = #{seqNo} + + + DELETE FROM C_SUBCNTRSTTUS + WHERE RCEPT_NO = #{rceptNo} + UPDATE C_APPRESON diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04.jsp index d5fcaae5..c0b81efe 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04.jsp @@ -1690,7 +1690,7 @@ 신청인 - +
diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_1.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_1.jsp index 54aed3c5..0bc1c59a 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_1.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_1.jsp @@ -1218,7 +1218,7 @@ 피신청인 - +
diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_3.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_3.jsp index b712c1b1..3c5ca963 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_3.jsp +++ b/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(); diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_4.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_4.jsp index 366ac1c2..2916291a 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_4.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_4.jsp @@ -1281,6 +1281,9 @@ document.addEventListener('DOMContentLoaded', function() { + + +