diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java index 35d819d4..30fdfddf 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java @@ -778,26 +778,24 @@ public class CndtnTrgtMngController { //병합이면 대상을 찾아서 넣는다. System.out.println("cndtnTrgtMngVO.getMergeStatus()"); System.out.println(cndtnTrgtMngVO.getMergeStatus()); + + //병합요청인지 확인 if (cndtnTrgtMngVO.getMergeStatus()!=null && !"".equals(cndtnTrgtMngVO.getMergeStatus())) { + //가능한 병합대상을 찾는다. CndtnTrgtMngVO cndtnTrgtMergeVO = cndtnTrgtInfoMngService.selectDetail4Merge(cndtnTrgtMngVO); - if (cndtnTrgtMergeVO!=null && cndtnTrgtMergeVO.getTrgtNm().equals(cndtnTrgtMngVO.getTrgtNm())) { + + //자기 자신으로 병합되지는 않는다. + if (cndtnTrgtMergeVO!=null && !cndtnTrgtMergeVO.getReqNmbr().equals(cndtnTrgtMngVO.getReqNmbr())) { cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(cndtnTrgtMergeVO.getSspnIdtmtTrgtOrd()); } } + //excel 데이터를 넣거나, 업데이트 한다. i+=cndtnTrgtInfoMngService.insert4Merge(cndtnTrgtMngVO); - } - - /* - for (int i=0;i주민번호앞자리
- +
<%-- --%> diff --git a/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js b/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js index b9308724..d55cd093 100644 --- a/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js +++ b/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js @@ -206,6 +206,7 @@ $(window).on('load',function(){ function calendarSetting(){ $('.calendar_wrap').each(function(){ $(this).find('.duet-date__input').attr('onkeydown','this.value=dateSetting(this.value);'); + $(this).find('.duet-date__input').attr('onblur','this.value=dateSettingHere(this.value);'); }); }