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

2025-09-26 18:02 설문내용 수정

Browse Source
This commit is contained in:
myname 2025-09-26 18:03:03 +09:00
parent f5c04d4285
commit 3845c092be
6 changed files with 1130 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java
View File

@ -753,7 +753,8 @@ public class EgovCryptoUtil {
vo.setUserId(this.decrypt(vo.getUserId()));
vo.setPhone(this.decrypt(vo.getPhone()));
vo.setPhone(this.decrypt(vo.getPhone()));
vo.setPhone(this.decrypt(vo.getPhone()));
//vo.setdBirth(this.decrypt(vo.getdBirth()));
vo.setDBirth(this.decrypt(vo.getDBirth()));
if (StringUtils.isNotEmpty( vo.getTrgtNm()) ) vo.setTrgtNm(this.decrypt(vo.getTrgtNm().trim()));
// }
}

7
src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-uss-olp-qri.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqlMapConfig PUBLIC "-//iBATIS.com//DTD SQL Map Config 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-config-2.dtd">
<sqlMapConfig>
<sqlMap resource="egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Postgresql.xml"/>
</sqlMapConfig>

1102
src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Postgresql.xml Normal file
View File

File diff suppressed because it is too large Load Diff

17
src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml
View File

@ -1208,12 +1208,15 @@
SELECT
a.QUSTNR_TMPLAT_ID ,
a.SITE_ID ,
(CASE WHEN a.site_id_cd = '10' THEN a.QESTNR_ID END) AS QESTNR_ID_10
(CASE WHEN a.STTUS = '1' THEN a.QESTNR_ID END) AS QESTNR_ID_10
FROM
LETTNQESTNRINFO a
WHERE
a.SITE_ID = #siteId#
/*
AND a.SITE_ID_CD IN ('10')
*/
AND a.STTUS IN ('1')
AND TO_CHAR(NOW(),
'YYYY.MM.DD') BETWEEN COALESCE(a.qustnr_bgnde,
'2000.01.01')
@ -1223,19 +1226,22 @@
LIMIT 1
) I10 ON
(1 = 1)
LEFT OUTER JOIN (
/* 현재 진행가능한 설문 정보(기본, 선생님, 강사) 여러개가 있는 경우는 최근 등록된 설문 정보를 가져온다.*/
SELECT
a.QUSTNR_TMPLAT_ID ,
a.SITE_ID ,
(CASE WHEN a.site_id_cd = '20' THEN a.QESTNR_ID END) AS QESTNR_ID_20
(CASE WHEN a.STTUS = '1' THEN a.QESTNR_ID END) AS QESTNR_ID_20
FROM
LETTNQESTNRINFO a
WHERE
a.SITE_ID = #siteId#
/*
AND a.SITE_ID_CD IN ('20')
*/
AND a.STTUS IN ('1')
AND TO_CHAR(NOW(),
'YYYY.MM.DD') BETWEEN COALESCE(a.qustnr_bgnde,
'2000.01.01')
@ -1251,13 +1257,16 @@
SELECT
a.QUSTNR_TMPLAT_ID ,
a.SITE_ID ,
(CASE WHEN a.site_id_cd = '30' THEN a.QESTNR_ID END) AS QESTNR_ID_30
(CASE WHEN a.STTUS = '1' THEN a.QESTNR_ID END) AS QESTNR_ID_30
FROM
LETTNQESTNRINFO a
WHERE
a.SITE_ID = #siteId#
/*
AND a.SITE_ID_CD IN ('30')
*/
AND a.STTUS IN ('1')
AND TO_CHAR(NOW(),
'YYYY.MM.DD') BETWEEN COALESCE(a.qustnr_bgnde,
'2000.01.01')

2
src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp
View File

@ -685,7 +685,7 @@
<div class="btn_center">
</div>
<div class="btn_right">
<button type="button" class="btn_type04 btn fill lightblue" onclick="fn_updateCancelReqStatus(10, 10); return false;">의뢰취소복구</button>
<button type="button" class="btn_type04 btn fill lightblue" onclick="fn_updateCancelReqStatus('', 15); return false;">의뢰취소복구</button>
<button type="button" class="btn_type05 btn line red" onclick="fn_updateReqStatus(60, 40); return false;">의뢰취소</button>
<!-- <button type="button" class="btn_type02" onclick="fn_eduAsgnm(); return false;">교육배정</button> -->

8
src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp
View File

@ -230,9 +230,10 @@
<button type="button" class="btnType02" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');">취소</button>
</c:if>
<c:if test="${list.aprvlCd eq '60' and list.ddlnCd eq '20'}">
승인
<%-- <button type="button" class="btnType02" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');">취소</button> --%>
</c:if>
</c:if>
</td>
<td>
<!-- 신청 승인상태 20 and 현재가 교육종료보다 이후 체크 1 -->
@ -249,7 +250,8 @@
<%-- </c:choose> --%>
<c:choose>
<c:when test="${list.aprvlCd eq 20 and list.qestRsltExists and list.aplctStateCd ne 10 and list.aplctStateCd ne 30}">
<c:when test="${list.aprvlCd eq 60 and list.qestRsltExists and list.aplctStateCd ne 10 and list.aplctStateCd ne 30}">
<!-- 설문노출대상(승인처리를 받았음(20) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
<c:choose>