tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2024-01-22 11:07 강사이름 검색 오류 수정

Browse Source
This commit is contained in:
myname 2024-01-22 11:07:39 +09:00
parent e956d167bd
commit b44f03de58
10 changed files with 181 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/kcc/ve/oprtn/adultVisitEdu/eduRsltMng/web/EduRsltMngAdultController.java
View File

@ -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());
}

4
src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java
View File

@ -10,8 +10,12 @@ public interface CndtnTrgtMngService {
List<CndtnTrgtMngVO> selectPagingList(CndtnTrgtMngVO cndtnTrgtInfoMngVO);
void insert(CndtnTrgtMngVO cndtnTrgtInfoMngVO);
int insert4Merge(CndtnTrgtMngVO cndtnTrgtInfoMngVO);
CndtnTrgtMngVO selectDetail(CndtnTrgtMngVO cndtnTrgtInfoVO);
CndtnTrgtMngVO selectDetail4Merge(CndtnTrgtMngVO cndtnTrgtInfoVO);
void update(CndtnTrgtMngVO cndtnTrgtInfoMngVO);

13
src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java
View File

@ -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"
;
}

8
src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java
View File

@ -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);
}

11
src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java
View File

@ -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);

3
src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/TrgtExcelReader.java
View File

@ -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);

30
src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
View File

@ -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<trgtExcelVOList.size();i++) {
}
cndtnTrgtInfoMngService.bulkInsert(trgtExcelVOList);
*/

8
src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduRsltMng/web/EduRsltMngTngrController.java
View File

@ -231,7 +231,15 @@ public class EduRsltMngTngrController {
*
* */
System.out.println("vEEduAplctVO.getSearchCondition()");
System.out.println(vEEduAplctVO.getSearchCondition());
System.out.println(vEEduAplctVO.getSearchNm());
vEEduAplctVO = egovCryptoUtil.encryptVEEduAplctVOInfo(vEEduAplctVO);
System.out.println(vEEduAplctVO.getSearchCondition());
System.out.println(vEEduAplctVO.getSearchNm());
List<VEEduAplctVO> vEEduAplctVOList = vEEduMIXService.selectTngrRsltPagingList(vEEduAplctVO);
VEEduAplctVO vo = new VEEduAplctVO();
for(int i=0; i < vEEduAplctVOList.size(); i++) {

100
src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml
View File

@ -16,11 +16,13 @@
<sql id="CndtnTrgtInfoMngDAO.column_name">
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 @@
<!-- 등록 C -->
<insert id="cndtnTrgtInfoMngDAO.insert" parameterClass="CndtnPrcsInfoMngVO">
/* cndtnTrgtInfoMngDAO.insert */
INSERT INTO <include refid="CndtnTrgtInfoMngDAO.table_name"/> (
<include refid="CndtnTrgtInfoMngDAO.column_name"/>
@ -111,6 +114,84 @@
)
</insert>
<!-- 등록 C -->
<update id="cndtnTrgtInfoMngDAO.insert4Merge" parameterClass="CndtnPrcsInfoMngVO">
/* cndtnTrgtInfoMngDAO.insert4Merge */
MERGE INTO <include refid="CndtnTrgtInfoMngDAO.table_name"/> 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_aplct_ord = #eduAplctOrd#,
edu_chasi_ord = #eduChasiOrd#, -->
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 (
<include refid="CndtnTrgtInfoMngDAO.column_name"/>
)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#
)
</update>
<!-- bulkInsert -->
<insert id="cndtnTrgtInfoMngDAO.bulkInsert" parameterClass="CndtnPrcsInfoMngVO">
@ -159,6 +240,21 @@
AND sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd#
</select>
<!-- 병합 대상자 찾기 -->
<select id="cndtnTrgtInfoMngDAO.selectDetail4Merge" parameterClass="CndtnPrcsInfoMngVO" resultClass="CndtnPrcsInfoMngVO">
/* cndtnTrgtInfoMngDAO.selectDetail4Merge */
SELECT
<include refid="CndtnTrgtInfoMngDAO.select_column_name"/>
FROM
<include refid="CndtnTrgtInfoMngDAO.table_name"/> a
WHERE
1=1
AND trgt_nm=#trgtNm#
AND sex=#sex#
AND d_birth=#dBirth#
ORDER BY req_pnttm
LIMIT 1
</select>
<!-- 강사 수정 C -->
<update id="cndtnTrgtInfoMngDAO.update" parameterClass="CndtnPrcsInfoMngVO">

10
src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngList.jsp
View File

@ -225,6 +225,13 @@
alert("발송되었습니다.");
}
function fncReset(thisObj){
var targetObj = $(thisObj).closest('.list_top').find('select,input');
$.each(targetObj, function(){
$(this).val('');
});
}
</script>
<title>신청관리</title>
</head>
@ -284,6 +291,7 @@
<input type="text" id="searchKeyword" name="searchKeyword" class="search_input" placeholder="검색어를 입력하세요" value="<c:out value='${vEEduAplctVO.searchKeyword}'/>" onkeydown="if(event.keyCode==13) {linkPage('1');}">
<button class="btn_type08" onclick="fncGoList(); return false;">검색</button>
<button class="btn_type03" onclick="fncReset(this); return false;">초기화</button>
</div>
</div>
@ -376,7 +384,7 @@
</tr>
</c:forEach>
<c:if test="${empty list}">
<tr><td colspan="7"><spring:message code="common.nodata.msg" /></td></tr>
<tr><td colspan="9"><spring:message code="common.nodata.msg" /></td></tr>
</c:if>
</tbody>
</table>