diff --git a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java index d07e2d74..5a83a093 100644 --- a/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjCourtCnctn/service/impl/AdjCourtCnctnServiceImpl.java @@ -3,6 +3,7 @@ package kcc.kccadr.adjCourtCnctn.service.impl; import java.time.LocalDateTime; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import javax.annotation.Resource; @@ -52,29 +53,34 @@ public class AdjCourtCnctnServiceImpl extends EgovAbstractServiceImpl implements @Override public RestResponse insertCourtCnctn(AdjCourtCnctnVO adjCourtCnctnVO, final MultipartHttpServletRequest multiRequest) { + try { - adjCourtCnctnVO.setCrtSeq(courtCnctnGnrService.getNextStringId()); adjCourtCnctnVO.setCrtStatCd("101000"); adjCourtCnctnVO.setCrtStatCd(KccadrCourtConstants.CRT_REG); final Map files = multiRequest.getFileMap(); - if (!files.isEmpty()){ - List result = fileUtil.parseFileInf(files, "CRT_", 0, "", "", ""); - String atchFileId = fileMngService.insertFileInfs(result); - adjCourtCnctnVO.setCrtAtchFileId(atchFileId); - - AdrCourtFileVO adrCourtFileVO = new AdrCourtFileVO(); - - adrCourtFileVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq()); - adrCourtFileVO.setCrtSn(adjCourtCnctnVO.getCrtSn()); - adrCourtFileVO.setCrtAtchFileId(atchFileId); - adrCourtFileVO.setCrtAtchFileTy(KccadrCourtConstants.CRT_FILE_RETURN); - adrCourtFileVO.setFrstRegisterId(adjCourtCnctnVO.getFrstRegisterId()); - - adrCourtFileMngService.insertCourtFileInf(adrCourtFileVO); - } + if (!files.isEmpty()){ + for(Entry files_tmp : files.entrySet()) { + if(!files_tmp.getValue().getName().equals("file_temp")) { + List result = fileUtil.parseFileInf(files, "CRT_", 0, "", "", ""); + String atchFileId = fileMngService.insertFileInfs(result); + adjCourtCnctnVO.setCrtAtchFileId(atchFileId); + + AdrCourtFileVO adrCourtFileVO = new AdrCourtFileVO(); + + adrCourtFileVO.setCrtSeq(adjCourtCnctnVO.getCrtSeq()); + adrCourtFileVO.setCrtSn(adjCourtCnctnVO.getCrtSn()); + adrCourtFileVO.setCrtAtchFileId(atchFileId); + adrCourtFileVO.setCrtAtchFileTy(KccadrCourtConstants.CRT_FILE_RETURN); + adrCourtFileVO.setFrstRegisterId(adjCourtCnctnVO.getFrstRegisterId()); + + adrCourtFileMngService.insertCourtFileInf(adrCourtFileVO); + } + } + } + adjCourtCnctnDAO.insertCourtCnctn(adjCourtCnctnVO); AdjCourtDeptVO adjCourtDeptVO = new AdjCourtDeptVO(); diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml index d1dc1dcb..80c8818c 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjCourtCnctn/AdjCourtCnctn_SQL_Mysql.xml @@ -181,7 +181,9 @@ crt_no, crt_dcsn_de, crt_rcpt_de, - crt_allct_de, + + crt_allct_de, + crt_rprt_de, @@ -223,7 +225,9 @@ #crtNo#, TO_DATETIME(TO_CHAR(#crtDcsnDe#,'YYYY-MM-DD')) , TO_DATETIME(TO_CHAR(#crtRcptDe#,'YYYY-MM-DD')) , - TO_DATETIME(TO_CHAR(#crtAllctDe#,'YYYY-MM-DD')) , + + TO_DATETIME(TO_CHAR(#crtAllctDe#,'YYYY-MM-DD')) , + TO_DATETIME(TO_CHAR(#crtRprtDe#,'YYYY-MM-DD')) , @@ -946,7 +950,9 @@ crt_no = #crtNo#, crt_dcsn_de = TO_DATETIME(TO_CHAR(#crtDcsnDe#,'YYYY-MM-DD')), crt_rcpt_de = TO_DATETIME(TO_CHAR(#crtRcptDe#,'YYYY-MM-DD')), + crt_allct_de = TO_DATETIME(TO_CHAR(#crtAllctDe#,'YYYY-MM-DD')), + crt_rprt_de = TO_DATETIME(TO_CHAR(#crtRprtDe#,'YYYY-MM-DD')), diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp index 549e9ce4..51ca56fb 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnModify.jsp @@ -71,8 +71,48 @@ function StringToDate(date, n) { } +function courtValiation(){ + var crtDcsnDe = $('#crtDcsnDe').val(); //법원결정일 + var crtRcptDe = $('#crtRcptDe').val(); //메일수신일(사건기록) + var crtNo = $('#crtNo').val(); //조정사건번호 + var crtOriNo = $('#crtOriNo').val(); //본사건번호 + var crtClimntPhone = $('#crtClimntPhone').val(); //원고연락처 + var crtDfndntPhone = $('#crtDfndntPhone').val(); //피고연락처 + + // 빈값 체크 + if (!crtDcsnDe) { + alert("법원결정일을 입력해 주세요."); + return false; + } + if (!crtRcptDe) { + alert("메일수신일(사건기록)을 입력해 주세요."); + return false; + } + if (!crtNo) { + alert("조정사건번호를 입력해 주세요."); + return false; + } + if (!crtOriNo) { + alert("본사건번호를 입력해 주세요."); + return false; + } + if (!crtClimntPhone) { + alert("원고연락처를 입력해 주세요."); + return false; + } + if (!crtDfndntPhone) { + alert("피고연락처를 입력해 주세요."); + return false; + } + + // 모든 필드가 입력되었을 때 + return true; +} + function fn_regist(){ + if(!courtValiation()) return false; + var msg = "수정 하시겠습니까?" if(confirm(msg)){ //신청인 정보 입력 diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp index c071654d..30c6e283 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnRegist.jsp @@ -75,18 +75,59 @@ function StringToDate(date, n) { "-" + (stringNewDate.getDate() > 9 ? stringNewDate.getDate().toString() : "0" + stringNewDate.getDate().toString()); } +function courtValiation(){ + var crtDcsnDe = $('#crtDcsnDe').val(); //법원결정일 + var crtRcptDe = $('#crtRcptDe').val(); //메일수신일(사건기록) + var crtNo = $('#crtNo').val(); //조정사건번호 + var crtOriNo = $('#crtOriNo').val(); //본사건번호 + var crtClimntPhone = $('#crtClimntPhone').val(); //원고연락처 + var crtDfndntPhone = $('#crtDfndntPhone').val(); //피고연락처 + + // 빈값 체크 + if (!crtDcsnDe) { + alert("법원결정일을 입력해 주세요."); + return false; + } + if (!crtRcptDe) { + alert("메일수신일(사건기록)을 입력해 주세요."); + return false; + } + if (!crtNo) { + alert("조정사건번호를 입력해 주세요."); + return false; + } + if (!crtOriNo) { + alert("본사건번호를 입력해 주세요."); + return false; + } + if (!crtClimntPhone) { + alert("원고연락처를 입력해 주세요."); + return false; + } + if (!crtDfndntPhone) { + alert("피고연락처를 입력해 주세요."); + return false; + } + + // 모든 필드가 입력되었을 때 + return true; +} function fn_regist(){ + if(!courtValiation()) return false; + var msg = "등록 하시겠습니까?" if(confirm(msg)){ //신청인 정보 입력 var data = new FormData(document.cnctnForm); var url= "/kccadr/adjCourtCnctn/adjCourtCnctnRegistAjax.do"; - _fileForm2.forEach(function(obj, idx) { - if (obj) data.append("file"+idx, obj.fileObj); - }); + if(_fileForm2.length > 0){ + _fileForm2.forEach(function(obj, idx) { + if (obj) data.append("file"+idx, obj.fileObj); + }); + } $.ajax({ type: "POST", @@ -187,7 +228,7 @@ function fn_GoList(){ - 메일수신일(사건기록)(사건기록) + 메일수신일(사건기록)