From 701066c0142ae3356fcb75e6a1b5ef43b337c01b Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 20 Oct 2025 15:52:38 +0900
Subject: [PATCH] =?UTF-8?q?2025-10-20=2015:52=20=EC=84=A4=EB=AC=B8=20?=
 =?UTF-8?q?=EC=A1=B0=EC=82=AC=20=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../olp/qmc/web/EgovQustnrManageController.java   |  4 ++++
 .../qqm/web/EgovQustnrQestnManageController.java  |  3 ++-
 .../qqm/EgovQustnrQestnManage_SQL_Postgresql.xml  |  1 +
 .../qri/EgovQustnrRespondInfo_SQL_Postgresql.xml  |  7 ++++++-
 .../ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml     | 15 +++++++++++++++
 .../jsp/uss/olp/qmc/EgovQustnrManageModify.jsp    |  2 ++
 .../olp/qqm/EgovItnQustnrQestnManageRegist.jsp    | 13 +++++++++----
 .../WEB-INF/jsp/web/ve/aplct/cmdTrgt/main.jsp     |  3 ++-
 .../ve/aplct/cmdTrgt/sspnIdtmtEduAplctList.jsp    |  5 ++++-
 9 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/main/java/kcc/let/uss/olp/qmc/web/EgovQustnrManageController.java b/src/main/java/kcc/let/uss/olp/qmc/web/EgovQustnrManageController.java
index a9bd9be4..ec299073 100644
--- a/src/main/java/kcc/let/uss/olp/qmc/web/EgovQustnrManageController.java
+++ b/src/main/java/kcc/let/uss/olp/qmc/web/EgovQustnrManageController.java
@@ -336,6 +336,10 @@ public class EgovQustnrManageController {
 			model.addAttribute("resultList", egovQustnrManageService.selectQustnrManageDetail(qustnrManageVO));
 			//설문정보
 			QustnrManageVO newQustnrManageVO = egovQustnrManageService.selectQustnrManageDetailModel(qustnrManageVO);
+			
+			//작성자명에 대한 복호화
+			newQustnrManageVO.setFrstRegisterId(egovCryptoUtil.decrypt(newQustnrManageVO.getFrstRegisterId()));
+			
 			model.addAttribute("qustnrManageVO", newQustnrManageVO);
 			//설문템플릿 정보 불러오기
 			model.addAttribute("listQustnrTmplat", egovQustnrManageService.selectQustnrTmplatManageList(qustnrManageVO));
diff --git a/src/main/java/kcc/let/uss/olp/qqm/web/EgovQustnrQestnManageController.java b/src/main/java/kcc/let/uss/olp/qqm/web/EgovQustnrQestnManageController.java
index 31b14f51..bce050bc 100644
--- a/src/main/java/kcc/let/uss/olp/qqm/web/EgovQustnrQestnManageController.java
+++ b/src/main/java/kcc/let/uss/olp/qqm/web/EgovQustnrQestnManageController.java
@@ -489,7 +489,8 @@ public class EgovQustnrQestnManageController {
     	System.out.println(sQestnrTmplatId);
     	System.out.println(sQestnrQesitmId);
     	
-    	if(!sQestnrId.equals("") && !sQestnrTmplatId.equals("")){
+    	if(!sQestnrId.equals("")){
+    	//    	if(!sQestnrId.equals("") && !sQestnrTmplatId.equals("")){
     		
     		int sum = Integer.valueOf((String)commandMap.get("qestnSn"));
     		if(sQestnrQesitmId.equals("")) {// 수정일경우
diff --git a/src/main/resources/egovframework/sqlmap/let/uss/olp/qqm/EgovQustnrQestnManage_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/let/uss/olp/qqm/EgovQustnrQestnManage_SQL_Postgresql.xml
index c15d1b06..7f784ace 100644
--- a/src/main/resources/egovframework/sqlmap/let/uss/olp/qqm/EgovQustnrQestnManage_SQL_Postgresql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/uss/olp/qqm/EgovQustnrQestnManage_SQL_Postgresql.xml
@@ -38,6 +38,7 @@
 
 	<!-- 설문문항:: 설문지 제목 검색  -->
 	<select id="QustnrQestnManage.selectQustnrManageQestnrSj" parameterClass="java.util.Map" resultClass="egovMap">
+		/*	QustnrQestnManage.selectQustnrManageQestnrSj	*/
 		SELECT QUSTNR_SJ
 		FROM LETTNQESTNRINFO
 		WHERE QESTNR_ID = #qestnrId#
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
index c54db9b7..b20d6a91 100644
--- 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
@@ -870,7 +870,12 @@
 			) e			
 			
 		                          
-		WHERE a.QUSTNR_TMPLAT_ID 	=	#qustnrTmplatId#
+		WHERE 1=1
+		
+		/*
+			AND a.QUSTNR_TMPLAT_ID 	=	qustnrTmplatId
+			*/
+			
 			AND a.QESTNR_ID 		=	#qestnrId#		
 			
 		ORDER BY a.qestn_sn, A.QUSTNR_QESITM_ID 			
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 cf68f408..b33bd8f6 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
@@ -1227,7 +1227,10 @@
 			SELECT
 				a.QUSTNR_TMPLAT_ID ,
 				a.SITE_ID ,
+				/*
 				(CASE WHEN a.STTUS = '1' THEN a.QESTNR_ID END) AS QESTNR_ID_10
+				*/
+				(CASE WHEN a.STTUS = '1' THEN a.QESTNR_ID ELSE a.QESTNR_ID END) AS QESTNR_ID_10
 			FROM
 				LETTNQESTNRINFO a
 			WHERE
@@ -1235,7 +1238,9 @@
 				/*
 				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')
@@ -1251,7 +1256,10 @@
 			SELECT
 				a.QUSTNR_TMPLAT_ID ,
 				a.SITE_ID ,
+				/*
 				(CASE WHEN a.STTUS = '1' THEN a.QESTNR_ID END) AS QESTNR_ID_20
+				*/
+				(CASE WHEN a.STTUS = '1' THEN a.QESTNR_ID ELSE a.QESTNR_ID END) AS QESTNR_ID_20
 
 			FROM
 				LETTNQESTNRINFO a
@@ -1260,7 +1268,9 @@
 				/*
 				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')
@@ -1276,7 +1286,10 @@
 			SELECT
 				a.QUSTNR_TMPLAT_ID ,
 				a.SITE_ID ,
+				/*
 				(CASE WHEN a.STTUS = '1' THEN a.QESTNR_ID END) AS QESTNR_ID_30
+				*/
+				(CASE WHEN a.STTUS = '1' THEN a.QESTNR_ID ELSE a.QESTNR_ID END) AS QESTNR_ID_30
 
 			FROM
 				LETTNQESTNRINFO a
@@ -1285,7 +1298,9 @@
 				/*
 				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/uss/olp/qmc/EgovQustnrManageModify.jsp b/src/main/webapp/WEB-INF/jsp/uss/olp/qmc/EgovQustnrManageModify.jsp
index d13829cf..784c2ab9 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/olp/qmc/EgovQustnrManageModify.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/olp/qmc/EgovQustnrManageModify.jsp
@@ -89,10 +89,12 @@ function fn_egov_list_QustnrManage(){
 		}
 		//첨부파일 등록 처리-step1
 		//if(!data.get("fileSize")){
+		/*
 		if($('#tbody_fiielist tr').length*1<=0){
 			alert("첨부파일을 등록해 주세요");
 			return false;
 		}
+		*/
 		
 		if(confirm("<spring:message code='common.save.msg' />")){
 			//첨부파일 등록 처리
diff --git a/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/EgovItnQustnrQestnManageRegist.jsp b/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/EgovItnQustnrQestnManageRegist.jsp
index 8170e860..f7c191c2 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/EgovItnQustnrQestnManageRegist.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/olp/qqm/EgovItnQustnrQestnManageRegist.jsp
@@ -157,6 +157,8 @@ function fn_egov_save_QustnrItemManage(cmd){
 		logParam = "U";
 	}
 	
+	//alert(varFrom.appPlaceTy.value);
+	
 	if(confirm(message)){
 		varFrom.action =  "<c:url value='/uss/olp/qim/EgovQustnrItemManageRegist.do'/>?logParam="+logParam;
 		
@@ -179,10 +181,13 @@ function fn_egov_save_QustnrItemManage(cmd){
 					return false;
 				}
 			});	 
-			if(iemCnCheck){
-				alert("설문문항정보를  입력해주세요!");
-				return ;
-			}
+
+			if (varFrom.appPlaceTy.value != 2)
+				if(iemCnCheck){
+					alert("설문문항정보를  입력해주세요!");
+					return ;
+				}
+			
 		}
 		
 		varFrom.cmd.value= cmd;
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/main.jsp
index 3ce3fe02..8f1a45f6 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/main.jsp
@@ -248,7 +248,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 20 and list.qestRsltExists and list.aplctStateCd ne 10 and list.aplctStateCd ne 30}"> --%>
+								<c:when test="${list.aprvlCd eq 60 and list.qestRsltExists}">
 								<!-- 설문노출대상(승인처리를 받았음(20) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
 
 									<c:choose>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/sspnIdtmtEduAplctList.jsp
index 7370af5e..1d92b0cd 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/sspnIdtmtEduAplctList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/sspnIdtmtEduAplctList.jsp
@@ -595,8 +595,11 @@ $(document).ready(function(){
 <%-- 								</c:otherwise> --%>
 <%-- 							</c:choose> --%>
 							
+							${list.aprvlCd}/${list.qestRsltExists}/${list.aplctStateCd}
+							
 							<c:choose>
-								<c:when test="${list.aprvlCd eq 20 and list.qestRsltExists and list.aplctStateCd ne 10}">
+<%-- 								<c:when test="${list.aprvlCd eq 20 and list.qestRsltExists and list.aplctStateCd ne 10}"> --%>
+								<c:when test="${list.aprvlCd eq 60 and list.qestRsltExists}">
 								<!-- 설문노출대상(승인처리를 받았음(20) && 교육기간이 지났음 list.qestRsltExists=true && 미이수가 아닌것(10) ) -->
 
 									<c:choose>