2023-10-16 17:17 청소년 수정 사항 작업

src/main/java/kcc/let/uss/olp/qmc/web/EgovQustnrManageController.java

@@ -165,61 +165,69 @@ public class EgovQustnrManageController {
 			, RedirectAttributes redirectAttributes
 			, ModelMap model , HttpSession session) throws Exception {
 
-		String sCmd = commandMap.get("cmd") == null ? "" : (String) commandMap.get("cmd");
+		try {
-		if (sCmd.equals("del")) {
+			String sCmd = commandMap.get("cmd") == null ? "" : (String) commandMap.get("cmd");
-			egovQustnrManageService.deleteQustnrManage(qustnrManageVO);
+			if (sCmd.equals("del")) {
-			redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("success.common.delete"));
+				egovQustnrManageService.deleteQustnrManage(qustnrManageVO);
-			RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/uss/olp/qmc/EgovQustnrManageList.do");
+				redirectAttributes.addFlashAttribute("message", egovMessageSource.getMessage("success.common.delete"));
-			return redirectUrlMaker.getRedirectUrl();
+				RedirectUrlMaker redirectUrlMaker = new RedirectUrlMaker("/uss/olp/qmc/EgovQustnrManageList.do");
-		}
+				return redirectUrlMaker.getRedirectUrl();
+			}
 
-		if(searchVO.getPageUnit() != 10) {
+			if(searchVO.getPageUnit() != 10) {
-    		searchVO.setPageUnit(searchVO.getPageUnit());
+	    		searchVO.setPageUnit(searchVO.getPageUnit());
+			}
+			
+			/** pageing */
+			PaginationInfo paginationInfo = new PaginationInfo();
+			paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
+			paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
+			paginationInfo.setPageSize(searchVO.getPageSize());
+
+			searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+			searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
+			searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+
+			LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+			if(null != loginVO && !"super".equals(loginVO.getSiteId())){  //리스트, 수정, 입력
+				searchVO.setSiteId(loginVO.getSiteId());
+			}
+			
+			if("".equals(searchVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+				searchVO.setSearchSortCnd("qestnrId");
+				searchVO.setSearchSortOrd("desc");
+			}
+			
+			
+			List<?> resultList =  egovQustnrManageService.selectQustnrManageList(searchVO) ;
+			
+			//System.out.println(((EgovMap)resultList.get(0)).get("totcnt"));
+			
+			paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((int)((EgovMap)resultList.get(0)).get("totcnt")) : 0);
+			model.addAttribute("resultList", resultList);
+			model.addAttribute("paginationInfo", paginationInfo);
+			
+			model.addAttribute("searchKeyword", commandMap.get("searchKeyword") == null ? "" : (String) commandMap.get("searchKeyword"));
+			model.addAttribute("searchCondition", commandMap.get("searchCondition") == null ? "" : (String) commandMap.get("searchCondition"));
+
+			ComDefaultCodeVO vo = new ComDefaultCodeVO();
+
+			vo.setCodeId("COM035"); //설문진행상태
+			List<?> qustnrManageSttusList = cmmUseService.selectCmmCodeDetail(vo);
+			model.addAttribute("qustnrManageSttusList", qustnrManageSttusList);
+			
+			/*설문참여권한 조회*/
+			AuthorManageVO authorManageVO = new AuthorManageVO();
+			authorManageVO.setFirstIndex(0);
+			authorManageVO.setLastIndex(10);
+			authorManageVO.setRecordCountPerPage(10);
+			authorManageVO.setAuthorManageList(egovAuthorManageService.selectAuthorList(authorManageVO));
+			model.addAttribute("qestnrTrgetList", authorManageVO.getAuthorManageList());
+				
+		}catch(Exception ex) {
+			ex.printStackTrace();
 		}
 		
-		/** pageing */
-		PaginationInfo paginationInfo = new PaginationInfo();
-		paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
-		paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
-		paginationInfo.setPageSize(searchVO.getPageSize());
-
-		searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
-		searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
-		searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
-
-		LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
-		if(null != loginVO && !"super".equals(loginVO.getSiteId())){  //리스트, 수정, 입력
-			searchVO.setSiteId(loginVO.getSiteId());
-		}
-		
-		if("".equals(searchVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
-			searchVO.setSearchSortCnd("qestnrId");
-			searchVO.setSearchSortOrd("desc");
-		}
-		
-		
-		List<?> resultList =  egovQustnrManageService.selectQustnrManageList(searchVO) ;
-		
-		paginationInfo.setTotalRecordCount( resultList.size()> 0 ? ((int)((EgovMap)resultList.get(0)).get("totcnt")) : 0);
-		model.addAttribute("resultList", resultList);
-		model.addAttribute("paginationInfo", paginationInfo);
-		
-		model.addAttribute("searchKeyword", commandMap.get("searchKeyword") == null ? "" : (String) commandMap.get("searchKeyword"));
-		model.addAttribute("searchCondition", commandMap.get("searchCondition") == null ? "" : (String) commandMap.get("searchCondition"));
-
-		ComDefaultCodeVO vo = new ComDefaultCodeVO();
-
-		vo.setCodeId("COM035"); //설문진행상태
-		List<?> qustnrManageSttusList = cmmUseService.selectCmmCodeDetail(vo);
-		model.addAttribute("qustnrManageSttusList", qustnrManageSttusList);
-		
-		/*설문참여권한 조회*/
-		AuthorManageVO authorManageVO = new AuthorManageVO();
-		authorManageVO.setFirstIndex(0);
-		authorManageVO.setLastIndex(10);
-		authorManageVO.setRecordCountPerPage(10);
-		authorManageVO.setAuthorManageList(egovAuthorManageService.selectAuthorList(authorManageVO));
-		model.addAttribute("qestnrTrgetList", authorManageVO.getAuthorManageList());	
 		return "/uss/olp/qmc/EgovQustnrManageList";
 	}
 

src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java

@@ -585,6 +585,8 @@ public class EduEndTngrController {
 			qustnrRespondManageVO.setQestnrRespondent(qustnrRespondInfoVO.getQestnrRespondent());
 			qustnrRespondManageVO.setFrstRegisterId(loginVO.getId());
 			qustnrRespondManageVO.setLastUpdusrId(loginVO.getId());
+			//qustnrRespondManageVO.setQestnrTmplatId(qestnrTmplatId);
+			
 			egovQustnrRespondManageService.insertQustnrRespondManage(qustnrRespondManageVO);
 			// 설문 문항 결과 등록
 			for(int i=0; i < qustnrRespondInfoVO.getResultList().size(); i++) {

src/main/resources/egovframework/sqlmap/let/uss/olp/qmc/EgovQustnrManage_SQL_Tibero.xml

@@ -79,8 +79,8 @@
 			, a.qustnr_sj				qestnrSj
 			, a.qustnr_purps			qestnrPurps
 			, a.qustnr_writng_guidance_cn		qestnrwritngguidancecn
-			, date_format(a.qustnr_bgnde,'%y-%m-%d') 		qestnrBeginDe
+			, a.qustnr_bgnde 		qestnrBeginDe
-			, date_format(a.qustnr_endde,'%y-%m-%d') 			qestnrEndDe
+			, a.qustnr_endde 			qestnrEndDe
 			, a.qustnr_trget			qestnrtrget
 			, a.qustnr_tmplat_id		qestnrtmplatid
 			, a.frst_regist_pnttm		frstregisterpnttm
@@ -94,7 +94,7 @@
 			, ( select count(*) from lettnqustnrqesitm where  qestnr_id = a.qestnr_id ) qustnrQesitmCnt 
 			, ( select count(*) from lettnqustnrrespondinfo where qestnr_id = a.qestnr_id ) rrspnsResultCnt
 			, case  
-				when date_format(a.qustnr_endde,'%y%m%d') < date_format(now(), '%y%m%d') then '2'  /* 종료 */
+				when a.qustnr_endde < TO_CHAR(SYSDATE, 'YYYYMMDD') then '2'  /* 종료 */
 				else a.sttus 
 				end as sttus
 			, (select qustnr_tmplat_path_nm from lettnqustnrtmplat where qustnr_tmplat_id =  a.qustnr_tmplat_id ) template_url 
@@ -115,7 +115,7 @@
 			 	</isEqual>
 		 	</isNotEqual>
 		</isNotEmpty>
-		ORDER BY 1=1
+		ORDER BY 1
         <isNotEmpty property="searchSortCnd">
 			,$searchSortCnd$
 		</isNotEmpty>
@@ -123,7 +123,11 @@
 		 	$searchSortOrd$
 		</isNotEmpty>
 		<isNotEqual property="pageIndex"  compareValue="0">
-		LIMIT #recordCountPerPage# OFFSET #firstIndex#
+		
+		/*
+		LIMIT recordCountPerPage OFFSET firstIndex
+		*/
+		OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;			
 		</isNotEqual>
 	</select>
 

src/main/resources/egovframework/sqlmap/let/uss/olp/qrm/EgovQustnrRespondManage_SQL_Tibero.xml

@@ -77,7 +77,10 @@
 	 </isNotEmpty>
 	 <![CDATA[
 		ORDER BY A.FRST_REGIST_PNTTM DESC
-		LIMIT #recordCountPerPage# OFFSET #firstIndex#
+		/*
+		LIMIT recordCountPerPage OFFSET firstIndex
+		*/
+		OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;			
 	]]>
 	</select>
 
@@ -122,9 +125,9 @@
 			, #eduChasiOrd#
 			, #qestnrParticipant#
 			, #qestnrRespondent#
-			, NOW()
+			, SYSDATE
 			, #frstRegisterId#
-			, NOW()
+			, SYSDATE
 			, #lastUpdusrId#
 		)
 	 ]]>

src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Tibero.xml

@@ -929,13 +929,17 @@
     </insert>
     
     <select id="userManageDAO.selectOffeduUserList" parameterClass="userVO" resultClass="userVO">
-   	 /* 임시.*NOT_SQL_LOG.* userManageDAO.selectOffeduUser */
+   	 /* 임시.*NOT_SQL_LOG.* userManageDAO.selectOffeduUserList */
-    	SELECT COUNT(mber_id) OVER() AS totCnt,
+    	SELECT COUNT(mber_id) OVER() AS totCnt
-    			a.mber_id AS mberId
+    			, a.mber_id AS mberId
+    			, a.esntl_id AS esntlId
+    			
 		FROM   lettngnrlmber a
 		WHERE 1=1
 		<isNotEmpty property="searchWord" prepend="AND"> 
 			a.mber_id LIKE '%'||#searchWord#||'%'
+			OR
+			a.esntl_id LIKE '%'||#searchWord#||'%'
 		</isNotEmpty>
 		OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
     </select>

src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml

@@ -2504,8 +2504,11 @@
 	
 	<select id="VEEduMIXDAO.selectChasiInfo" parameterClass="VEEduChasiVO" resultClass="VEEduChasiVO">
 		/*	VEEduMIXDAO.selectChasiInfo	*/
-		SELECT 
+		SELECT
-			 STR_TO_DATE(B.edu_hope_dt,'%Y%m%d') AS eduHopeDt 
+		/* 
+			 TO_CHAR(B.edu_hope_dt,'YYYYMMDD') AS eduHopeDt
+			 */ 
+			 B.edu_hope_dt 		 AS eduHopeDt
 			, B.strt_tm			 AS strtTm
 			, B.end_tm			 AS endTm
 			, B.lrn_tm			 AS lrnTm

src/main/webapp/WEB-INF/jsp/oprtn/cmm/userPopListBower.jsp

@@ -54,18 +54,23 @@
 				<table>
 					<colgroup>
 						<col style="width: auto;">
+						<col style="width: auto;">
 					</colgroup>
 					<thead>
 					<tr>
-						<th scope="col">아이디</th>
+						<th scope="col">e-배움터아이디</th>
+						<th scope="col">찾교아이디</th>
 					</tr>
 					</thead>
 					<tbody>
 					<c:forEach var="row" items="${userList}" varStatus="status">
 						<tr>
 							<td>
-								<a href="#" onclick="fncUserDataSlct(this); return false;" data-value="${row.mberId}"><c:out value="${row.mberId}" /></a> 
+								<a href="#" onclick="fncUserDataSlct(this); return false;" data-value="${row.esntlId}"><c:out value="${row.mberId}" /></a> 
-								<input type="hidden" name="userId" value="${row.mberId}"/> 
+								<input type="hidden" name="userId" value="${row.esntlId}"/> 
+							</td>
+							<td>
+								<a href="#" onclick="fncUserDataSlct(this); return false;" data-value="${row.esntlId}"><c:out value="${row.esntlId}" /></a>								 
 							</td>
 						</tr>
 					</c:forEach>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy.jsp

@@ -117,7 +117,8 @@
 				  }
 			  }
 			});
-		
+
+		$("select[name=divCd] option[value='10']").remove();
 		$("select[name=divCd] option[value='20']").remove();
 		$("select[name=divCd] option[value='30']").remove();
 	});

src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduEnd/eduEndDetail.jsp

@@ -914,7 +914,8 @@
 	
 	<div class="tb_tit01">
 		<div class="tb_tit01_left">
-			<p>교육내용 및 기자재 정보</p>
+<!-- 			<p>교육내용 및 기자재 정보</p> -->
+			<p>기자재 정보</p>
 		</div>
 	</div>
 	<div class="tb_type01 tb_write">
@@ -924,6 +925,7 @@
 				<col style="width: auto;">
 			</colgroup>
 			<tbody>
+			<!-- 
 			<tr>
 				<th scope="row">
 					<p>교육내용</p>
@@ -938,6 +940,7 @@
 					</c:forEach>
 				</td>
 			</tr>
+			 -->
 			<tr>
 				<th scope="row">
 					<p>기자재 유무</p>