From 3845c092bee2f6215e1c86d0a805a8af598e57d1 Mon Sep 17 00:00:00 2001 From: myname Date: Fri, 26 Sep 2025 18:03:03 +0900 Subject: [PATCH] =?UTF-8?q?2025-09-26=2018:02=20=EC=84=A4=EB=AC=B8?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/utl/fcc/service/EgovCryptoUtil.java | 3 +- .../sql-map-config-postgresql-uss-olp-qri.xml | 7 + .../EgovQustnrRespondInfo_SQL_Postgresql.xml | 1102 +++++++++++++++++ .../ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml | 17 +- .../WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp | 2 +- .../jsp/web/ve/aplct/sspnIdtmt/main.jsp | 8 +- 6 files changed, 1130 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-uss-olp-qri.xml create mode 100644 src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Postgresql.xml diff --git a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java index b17ff80d..f03fab7c 100644 --- a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java +++ b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java @@ -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())); // } } diff --git a/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-uss-olp-qri.xml b/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-uss-olp-qri.xml new file mode 100644 index 00000000..80dbfa26 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/config/postgresql/sql-map-config-postgresql-uss-olp-qri.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Postgresql.xml new file mode 100644 index 00000000..c54db9b7 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/let/uss/olp/qri/EgovQustnrRespondInfo_SQL_Postgresql.xml @@ -0,0 +1,1102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE LETTNQUSTNRRSPNSRESULT + SET + QUSTNR_IEM_ID=#qustnrIemId#, + RESPOND_ANSWER_CN=#respondAnswerCn#, + RESPOND_NM=#respondNm#, + ETC_ANSWER_CN=#etcAnswerCn#, + LAST_UPDT_PNTTM = NOW(), + LAST_UPDUSR_ID = #lastUpdusrId# + WHERE 1=1 + AND QUSTNR_RSPNS_RESULT_ID = #qestnrQesrspnsId# + + + + + + + + + + + + + + + + + + + + + /* QustnrRespondInfo.insertSrvyInfo */ + INSERT INTO LETTNQESTNRRSLTDetail + ( + QUSTNR_TMPLAT_ID + , QESTNR_ID + , QUSTNR_QESITM_ID + , QUSTNR_RSLT_ID + , QUSTNR_IEM_ID + , EDU_APLCT_ORD + , EDU_CHASI_ORD + , RESPOND_ID + , VERY_SATISFIED + , SATISFIED + , NEITHER + , DISSATISFIED + , VERY_DISSATISFIED + , ANSWER + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + , LAST_UPDT_PNTTM + , LAST_UPDUSR_ID + + ) VALUES ( + #qustnrTmplatId# + , #qestnrId# + , #qestnrQesitmId# + , #qustnrRsltId# + , #qustnrIemId# + , #eduAplctOrd# + , #eduChasiOrd# + , #respondId# + , #verySatisfied# + , #satisfied# + , #neither# + , #dissatisfied# + , #veryDissatisfied# + , #answer# + , NOW() + , #frstRegisterId# + , NOW() + , #lastUpdusrId# + ) + + + + /* QustnrRespondInfo.insertSrvyEAInfo */ + INSERT INTO LETTNQESTNRRSLTEADetail + ( + QUSTNR_TMPLAT_ID + , QESTNR_ID + , QUSTNR_QESITM_ID + , QUSTNR_RSLT_ID + , QUSTNR_IEM_ID + , EDU_APLCT_ORD + , EDU_CHASI_ORD + , RESPOND_ID + , VERY_SATISFIED + , SATISFIED + , NEITHER + , DISSATISFIED + , VERY_DISSATISFIED + , ANSWER + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + , LAST_UPDT_PNTTM + , LAST_UPDUSR_ID + + , QUSTNR_NM + , QUSTNR_BIRTH + + ) VALUES ( + #qustnrTmplatId# + , #qestnrId# + , #qustnrQesitmId# + , #qustnrRsltId# + , #qustnrIemId# + , #eduAplctOrd# + , #eduChasiOrd# + , #respondId# + , #verySatisfied# + , #satisfied# + , #neither# + , #dissatisfied# + , #veryDissatisfied# + , #answer# + , NOW() + , #frstRegisterId# + , NOW() + , #lastUpdusrId# + + , #qustnrNm# + , #qustnrBirth# + ) + + + + /* QustnrRespondInfo.deleteSrvyEAInfo */ + DELETE FROM LETTNQESTNRRSLTEADetail + WHERE 1=1 + AND QUSTNR_TMPLAT_ID = #qustnrTmplatId# + AND QESTNR_ID = #qestnrId# + + AND QUSTNR_NM = #qustnrNm# + AND QUSTNR_BIRTH = #qustnrBirth# + + + + + /* QustnrRespondInfo.insertSrvyInfo_bak */ + INSERT INTO LETTNQESTNRRSLT + ( + QESTNR_ID + , QUSTNR_QESITM_ID + , QUSTNR_RSLT_ID + , QUSTNR_IEM_ID + , EDU_APLCT_ORD + , EDU_CHASI_ORD + , RESPOND_ID + , VERY_SATISFIED + , SATISFIED + , NEITHER + , DISSATISFIED + , VERY_DISSATISFIED + , ANSWER + , FRST_REGIST_PNTTM + , FRST_REGISTER_ID + , LAST_UPDT_PNTTM + , LAST_UPDUSR_ID + + ) VALUES ( + #qestnrId# + , #qestnrQesitmId# + , #qustnrRsltId# + , #qustnrIemId# + , #eduAplctOrd# + , #eduChasiOrd# + , #respondId# + , #verySatisfied# + , #satisfied# + , #neither# + , #dissatisfied# + , #veryDissatisfied# + , #answer# + , NOW() + , #frstRegisterId# + , NOW() + , #lastUpdusrId# + ) + + + + /* QustnrRespondInfo.updateSrvyInfo */ + UPDATE + LETTNQESTNRRSLTDetail + SET + very_satisfied = #verySatisfied# + , satisfied = #satisfied# + , neither = #neither# + , dissatisfied = #dissatisfied# + , very_dissatisfied = #veryDissatisfied# + , last_updt_pnttm = NOW() + , last_updusr_id = #lastUpdusrId# + WHERE 1=1 + AND QUSTNR_TMPLAT_ID = #qustnrTmplatId# + AND qestnr_id = #qestnrId# + AND qustnr_qesitm_id = #qestnrQesitmId# + AND qustnr_rslt_id = #qustnrRsltId# + + + + /* QustnrRespondInfo.updateSrvyEAInfo */ + UPDATE + LETTNQESTNRRSLTEADetail + SET + very_satisfied = #verySatisfied# + , satisfied = #satisfied# + , neither = #neither# + , dissatisfied = #dissatisfied# + , very_dissatisfied = #veryDissatisfied# + , last_updt_pnttm = NOW() + , last_updusr_id = #lastUpdusrId# + + , qustnr_nm = #qustnrNm# + , qustnr_birth = #qustnrBirth# + + WHERE 1=1 + AND QUSTNR_TMPLAT_ID = #qustnrTmplatId# + AND qestnr_id = #qestnrId# + AND qustnr_qesitm_id = #qestnrQesitmId# + AND qustnr_rslt_id = #qustnrRsltId# + + + + /* QustnrRespondInfo.updateSrvyInfo_bak */ + UPDATE + LETTNQESTNRRSLT + SET + very_satisfied = #verySatisfied# + , satisfied = #satisfied# + , neither = #neither# + , dissatisfied = #dissatisfied# + , very_dissatisfied = #veryDissatisfied# + , last_updt_pnttm = NOW() + , last_updusr_id = #lastUpdusrId# + WHERE 1=1 + AND qestnr_id = #qestnrId# + AND qustnr_qesitm_id = #qestnrQesitmId# + AND qustnr_rslt_id = #qustnrRsltId# + + + + UPDATE + lettnqustnrrespondinfo + SET + qestnr_respondent_count = #qestnrParticipant# + , qestnr_participant_count = #qestnrRespondent# + , last_updt_pnttm = NOW() + , last_updusr_id = #lastUpdusrId# + WHERE 1=1 + AND EDU_APLCT_ORD = #eduAplctOrd# + AND EDU_CHASI_ORD = #eduChasiOrd# + AND QUSTNR_RESPOND_ID = #qestnrRespondId# + + + + + + + + + + + + + + + + + + + + DELETE FROM lettnqustnrrespondinfo + WHERE 1=1 + AND edu_aplct_ord = #eduAplctOrd# + AND edu_chasi_ord = #eduChasiOrd# + + + + /* QustnrRespondInfo.deleteChasiStatusFormlettnqestnrrslt */ + DELETE FROM lettnqestnrrsltDetail + WHERE 1=1 + AND edu_aplct_ord = #eduAplctOrd# + AND edu_chasi_ord = #eduChasiOrd# + + + + /* QustnrRespondInfo.deleteChasiStatusFormlettnqestnrrsltEA */ + DELETE FROM lettnqestnrrsltDetail + WHERE 1=1 + AND edu_aplct_ord = #eduAplctOrd# + AND edu_chasi_ord = #eduChasiOrd# + + AND qustnr_rslt_id = #qustnrRsltId# + + + + + /* QustnrRespondInfo.deleteChasiStatusFormlettnqestnrrslt_bak */ + DELETE FROM lettnqestnrrslt + WHERE 1=1 + AND edu_aplct_ord = #eduAplctOrd# + AND edu_chasi_ord = #eduChasiOrd# + + + + /* QustnrRespondInfo.deleteVeaSulOpinion */ + DELETE FROM VEA_SUL_OPINION + WHERE 1=1 + AND edu_aplct_ord = #eduAplctOrd# + AND edu_chasi_ord = #eduChasiOrd# + + + + + + /* QustnrRespondInfo.deleteStatusFormlettnqestnrrslt */ + DELETE FROM lettnqestnrrsltDetail + WHERE 1=1 + AND edu_aplct_ord = #eduAplctOrd# + AND respond_id = #respondId# + + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml index b9b335c2..e5e7b349 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml @@ -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') diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp index 03f430bb..15b88476 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/trgtList.jsp @@ -685,7 +685,7 @@
- + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp index e1edba53..4aac63c5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/main.jsp @@ -230,9 +230,10 @@ + 승인 <%-- --%> - - + + @@ -249,7 +250,8 @@ <%-- --%> - + +