diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java index af268f2d..b6471828 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java @@ -182,7 +182,10 @@ public class EduRsltMngAdultController { // 검색자가 '강사이름'일 때, 암호화하여 검색자에 set한다. if("2".equals(vEEduAplctVO.getSearchCondition())) { - vEEduAplctVO.setSearchKeyword(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchKeyword())); + System.out.println("vEEduAplctVO.getSearchKeyword()"); + System.out.println(vEEduAplctVO.getSearchKeyword()); + //vEEduAplctVO.setSearchKeyword(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchKeyword())); + System.out.println(vEEduAplctVO.getSearchKeyword()); } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java index fa29e7eb..5f0041e7 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java @@ -10,8 +10,12 @@ public interface CndtnTrgtMngService { List selectPagingList(CndtnTrgtMngVO cndtnTrgtInfoMngVO); void insert(CndtnTrgtMngVO cndtnTrgtInfoMngVO); + + int insert4Merge(CndtnTrgtMngVO cndtnTrgtInfoMngVO); CndtnTrgtMngVO selectDetail(CndtnTrgtMngVO cndtnTrgtInfoVO); + + CndtnTrgtMngVO selectDetail4Merge(CndtnTrgtMngVO cndtnTrgtInfoVO); void update(CndtnTrgtMngVO cndtnTrgtInfoMngVO); diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java index 958bb33b..57da9c50 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java @@ -55,9 +55,12 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { private String regNmbr; //의뢰번호 + private String mergeStatus; //excel 등록시 병합상태 null or 병합 + + public String getSspnIdtmtTrgtOrd() { return sspnIdtmtTrgtOrd; } @@ -255,6 +258,13 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { this.rmrks = rmrks; } + public String getMergeStatus() { + return mergeStatus; + } + public void setMergeStatus(String mergeStatus) { + this.mergeStatus = mergeStatus; + } + @Override public String toString() { return "\n CndtnTrgtMngVO => \n" @@ -273,7 +283,8 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable { + ", prsctrNm=[" + prsctrNm + "] // 담당 검사 이름\n" + ", reqStateCd=[" + reqStateCd + "] // 요청 상태 코드\n" + ", eduStateCd=[" + eduStateCd + "] // 교육 상태 코드\n" - + ", prcsAplctPrdOrdCmplt=[" + prcsAplctPrdOrdCmplt + "] // 처리 신청 기간 순서 완료\n" + + ", prcsAplctPrdOrdCmplt=[" + prcsAplctPrdOrdCmplt + "] // 병합인 경우 상위 병합자의 기소유예대상자순번\n" + + ", mergeStatus=[" + mergeStatus + "] // 병합 상태(Excel)\n" + ", rmrks=[" + rmrks + "] // 비고\n" ; } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java index 1f945390..d636cba7 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java @@ -98,10 +98,18 @@ public class CndtnTrgtMngDAO extends EgovAbstractDAO { insert("cndtnTrgtInfoMngDAO.insert", cndtnTrgtInfoMngVO); } + public int insert4Merge(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + return update("cndtnTrgtInfoMngDAO.insert4Merge", cndtnTrgtInfoMngVO); + } + public CndtnTrgtMngVO selectDetail(CndtnTrgtMngVO cndtnTrgtInfoVO) { return (CndtnTrgtMngVO) select("cndtnTrgtInfoMngDAO.selectDetail", cndtnTrgtInfoVO); } + public CndtnTrgtMngVO selectDetail4Merge(CndtnTrgtMngVO cndtnTrgtInfoVO) { + return (CndtnTrgtMngVO) select("cndtnTrgtInfoMngDAO.selectDetail4Merge", cndtnTrgtInfoVO); + } + public void update(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { update("cndtnTrgtInfoMngDAO.update", cndtnTrgtInfoMngVO); } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java index c898b992..3b282caa 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java @@ -37,11 +37,22 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService { } + @Override + public int insert4Merge(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { + return cndtnTrgtInfoMngDAO.insert4Merge(cndtnTrgtInfoMngVO); + + } + @Override public CndtnTrgtMngVO selectDetail(CndtnTrgtMngVO cndtnTrgtInfoVO) { return cndtnTrgtInfoMngDAO.selectDetail(cndtnTrgtInfoVO); } + @Override + public CndtnTrgtMngVO selectDetail4Merge(CndtnTrgtMngVO cndtnTrgtInfoVO) { + return cndtnTrgtInfoMngDAO.selectDetail4Merge(cndtnTrgtInfoVO); + } + @Override public void update(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { cndtnTrgtInfoMngDAO.update(cndtnTrgtInfoMngVO); diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/TrgtExcelReader.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/TrgtExcelReader.java index 1eb0c71a..e59a54e4 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/TrgtExcelReader.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/TrgtExcelReader.java @@ -68,7 +68,8 @@ public class TrgtExcelReader { cndtnTrgtMngVO.setReqStateCd( getCellValue(row.getCell(12)) ); // 의뢰상태 코드 , if로 구분해야함 cndtnTrgtMngVO.setEduStateCd( getCellValue(row.getCell(13))); // 교육 상태 코드 - cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt( getCellValue(row.getCell(14))); // 병합상태코드 + //cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt( getCellValue(row.getCell(14))); // 병합상태코드 + cndtnTrgtMngVO.setMergeStatus(getCellValue(row.getCell(14))); // 병합상태text(excel전용) cndtnTrgtMngVO.setRmrks( getCellValue(row.getCell(15))); // 비고 cndtnTrgtInfoMngVOList.add(cndtnTrgtMngVO); 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 074861dd..840bc766 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 @@ -732,17 +732,27 @@ public class CndtnTrgtMngController { comDefaultEduCodeVO.setCodeId("VEA002"); comDefaultEduCodeVO.setCodeDc(cndtnTrgtMngVO.getEduStateCd()); cndtnTrgtMngVO.setEduStateCd( egovCmmUseService.selectCmmCodeDetailCode(comDefaultEduCodeVO) ); - - // 교육상태코드 - // 설별 + + // 성별 ComDefaultCodeVO comDefaultSexCodeVO = new ComDefaultCodeVO(); comDefaultSexCodeVO.setCodeId("COM014"); comDefaultSexCodeVO.setCodeDc(cndtnTrgtMngVO.getSex()); cndtnTrgtMngVO.setSex( egovCmmUseService.selectCmmCodeDetailCode(comDefaultSexCodeVO) ); - - + + //암호화 cndtnTrgtMngVO = egovCryptoUtil.encryptCndtnTrgtMngVOInfo(cndtnTrgtMngVO); + + //병합이면 대상을 찾아서 넣는다. + 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) { + cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(cndtnTrgtMergeVO.getSspnIdtmtTrgtOrd()); + } + } + LOGGER.info(cndtnTrgtMngVO.toString()); @@ -763,7 +773,17 @@ public class CndtnTrgtMngController { } LOGGER.info(" 엑셀 insert :: [{}]건", trgtExcelVOList.size()); + + for(CndtnTrgtMngVO cndtnTrgtMngVO : trgtExcelVOList) { + i+=cndtnTrgtInfoMngService.insert4Merge(cndtnTrgtMngVO); + } + + /* + for (int i=0;i vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO); VEEduAplctVO vo = new VEEduAplctVO(); for(int i=0; i < vEEduAplctVOList.size(); i++) { diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml index 1a990a05..945555d9 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml @@ -16,11 +16,13 @@ sspn_idtmt_trgt_ord , user_id - , edu_state_cd + , edu_state_cd + , frst_regist_pnttm , frst_register_id , last_updt_pnttm - , last_updusr_id + , last_updusr_id + , trgt_nm , clphone , d_birth @@ -78,6 +80,7 @@ + /* cndtnTrgtInfoMngDAO.insert */ INSERT INTO ( @@ -111,6 +114,84 @@ ) + + + + /* cndtnTrgtInfoMngDAO.insert4Merge */ + + MERGE INTO T1 USING DUAL + ON ( + T1.req_nmbr = #reqNmbr# + AND T1.vnt_nmbr = #vntNmbr# + AND T1.vnt_year = #vntYear# + AND T1.trgt_nm = #trgtNm# + AND T1.d_birth = #dBirth# + AND T1.sex = #sex# + ) + WHEN MATCHED THEN + UPDATE SET + + + edu_state_cd = #eduStateCd# + , last_updt_pnttm = SYSDATE + , last_updusr_id = #frstRegisterId# + , clphone = #clphone# + , addr = #addr# + , addr_detail = #addrDetail# + , post = #post# + , email = #email# + , req_pnttm = #reqPnttm# + + , cmptnt_athrt = #cmptntAthrt# + + , prsctr_nm = #prsctrNm# + , req_state_cd = #reqStateCd# + , atch_file_id = #atchFileId# + , prcs_aplct_prd_ord_cmplt = #prcsAplctPrdOrdCmplt# + , rmrks = #rmrks# + , edu_aplct_ord = #eduAplctOrd# + + + WHEN NOT MATCHED THEN + INSERT ( + + )VALUES( + #sspnIdtmtTrgtOrd# + , #userId# + , #eduStateCd# + + , SYSDATE + , #frstRegisterId# + , #lastUpdtPnttm# + , #lastUpdusrId# + + , #trgtNm# + , #clphone# + , #dBirth# + , #addr# + , #addrDetail# + , #post# + , #email# + , #reqPnttm# + , #vntYear# + , #vntNmbr# + , #cmptntAthrt# + , #sex# + , #reqNmbr# + , #prsctrNm# + , #reqStateCd# + , #atchFileId# + , #prcsAplctPrdOrdCmplt# + , #eduAplctOrd# + + , #rmrks# + + ) + + + + @@ -159,6 +240,21 @@ AND sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd# + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp index 0735c976..8567865e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp @@ -225,6 +225,13 @@ alert("발송되었습니다."); } + + function fncReset(thisObj){ + var targetObj = $(thisObj).closest('.list_top').find('select,input'); + $.each(targetObj, function(){ + $(this).val(''); + }); + } 신청관리 @@ -284,6 +291,7 @@ + @@ -376,7 +384,7 @@ - +