2023-09-12 10:34 화면 오류 수정

src/main/java/kcc/let/uat/uia/web/EgovLoginController.java

@@ -644,6 +644,8 @@ public class EgovLoginController {
                  * loginLog.setMenuNm("관리자로그인"); loginLogService.logInsertLoginLog(loginLog);
                  */
             }
+            
+            System.out.println("forward:/uat/uia/actionMain.do");
 
             return "forward:/uat/uia/actionMain.do"; // 성공 시 페이지.. (redirect 불가)
             // 개인키 삭제
@@ -1534,11 +1536,17 @@ public class EgovLoginController {
                 }
             }
         }
+        
         // e-배움터 연동 로그인 시 - LoginVO 세션의 return url로 이동
-        LoginVO eEduLoginVO = (LoginVO) session.getAttribute("APILoginVO");
+        try {            
-        if(eEduLoginVO.getUrl() != null) {
+            LoginVO eEduLoginVO = (LoginVO) session.getAttribute("APILoginVO");
-        	return "redirect:" + eEduLoginVO.getUrl();
+            if(eEduLoginVO.getUrl() != null) {
+            	return "redirect:" + eEduLoginVO.getUrl();
+            }        	
+        }catch(Exception ex) {
+        	ex.printStackTrace();
         }
+
         
         // 관리자 로그인 시
         LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();

src/main/java/kcc/let/uss/olp/qri/web/EgovQustnrRespondInfoController.java

@@ -1394,6 +1394,101 @@ public class EgovQustnrRespondInfoController {
 		return sLocationUrl;
 	}
 	
+	/**
+	 * 설문조사 전체 통계를 조회한다.(사용자)
+	 * @param searchVO
+	 * @param request
+	 * @param commandMap
+	 * @param model
+	 * @return "/uss/olp/qnn/EgovQustnrRespondInfoManageStatistics"
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/web/survey/jsontest.do")
+	public ModelAndView jsontest(
+			HttpServletRequest request,
+			@RequestParam Map <String, Object> commandMap,
+    		ModelMap model)
+    throws Exception {
+
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("jsonView");
+        
+		//리포팅툴 테스트용====================================
+
+        modelAndView.addObject("result", "{" + 
+        		"\"test1\":\"테스트1\"," + 
+        		"\"test2\":\"테스트2\"," + 
+        		"\"test3\":\"테스트3\"," + 
+        		"\"test4\":\"테스트4\"," + 
+        		"\"test5\":\"테스트5\"," + 
+        		"" + 
+        		"\"월 판매정보\": [" + 
+        		"" + 
+        		"{" + 
+        		"\"판매정보\": \"\"," + 
+        		"\"판매일자\": \"19980203\"," + 
+        		"\"상품코드\": \"P004\"," + 
+        		"\"고객코드\": \"C00012\"," + 
+        		"\"판매수량\": \"14\"," + 
+        		"\"판매단가\": \"1\"," + 
+        		"\"납부기한\": \"\"" + 
+        		"}," + 
+        		"{" + 
+        		"                \"판매정보\": \"\"," + 
+        		"                \"판매일자\": \"19980203\"," + 
+        		"                \"상품코드\": \"P001\"," + 
+        		"                \"고객코드\": \"C00012\"," + 
+        		"                \"판매수량\": \"10\"," + 
+        		"                \"판매단가\": \"6\"," + 
+        		"                \"납부기한\": \"\"" + 
+        		"            }," + 
+        		"            {" + 
+        		"                \"판매일자\": \"19980204\"," + 
+        		"                \"상품코드\": \"P010\"," + 
+        		"                \"고객코드\": \"C00001\"," + 
+        		"                \"판매수량\": \"10\"," + 
+        		"                \"판매단가\": \"2\"" + 
+        		"            }," + 
+        		"            {" + 
+        		"                \"판매일자\": \"19980204\"," + 
+        		"                \"상품코드\": \"P010\"," + 
+        		"                \"고객코드\": \"C00011\"," + 
+        		"                \"판매수량\": \"10\"," + 
+        		"                \"판매단가\": \"3\"" + 
+        		"            }," + 
+        		"            {" + 
+        		"                \"판매일자\": \"19980205\"," + 
+        		"                \"상품코드\": \"P005\"," + 
+        		"                \"고객코드\": \"C00007\"," + 
+        		"                \"판매수량\": \"3\"," + 
+        		"                \"판매단가\": \"4\"" + 
+        		"            }," + 
+        		"            {" + 
+        		"                \"판매일자\": \"19980205\"," + 
+        		"                \"상품코드\": \"P005\"," + 
+        		"                \"고객코드\": \"C00017\"," + 
+        		"                \"판매수량\": \"3\"," + 
+        		"                \"판매단가\": \"5\"" + 
+        		"            }," + 
+        		"            {" + 
+        		"                \"판매일자\": \"19980205\"," + 
+        		"                \"상품코드\": \"P010\"," + 
+        		"                \"고객코드\": \"C00002\"," + 
+        		"                \"판매수량\": \"15\"," + 
+        		"                \"판매단가\": \"6\"" + 
+        		"            }," + 
+        		"            {" + 
+        		"                \"판매일자\": \"19980205\"," + 
+        		"                \"상품코드\": \"P010\"," + 
+        		"                \"고객코드\": \"C00012\"," + 
+        		"                \"판매수량\": \"15\"," + 
+        		"                \"판매단가\": \"7\"" + 
+        		"            }            " + 
+        		"        ]" + 
+        		"    }");
+        return modelAndView;        
+		
+	}
 	
 	/**
 	 * 설문조사 전체 통계를 조회한다.

src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java

@@ -214,7 +214,20 @@ public class EduAplctTngrController {
         modelAndView.addObject("result", "success");
         return modelAndView;
     }
-	
+
+    /**
+     * 교육 신청서 등록
+     */
+	@RequestMapping("aPopupAjax.do")
+    public ModelAndView aPopupAjax( @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request , final MultipartHttpServletRequest multiRequest ) throws Exception {
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("jsonView");
+        
+		//리포팅툴 테스트용====================================
+
+        modelAndView.addObject("result", "success");
+        return modelAndView;
+    }
 	
 	/**
 	 * 교육 신청 시 강의신청기간, 강의가능시간이  유효한지 체크

src/main/resources/egovframework/sqlmap/let/sym/site/EgovSiteManage_SQL_Tibero.xml

@@ -82,12 +82,13 @@
     </insert>
 
      <select id="siteManagerDAO.selectSiteManagerList" parameterClass="siteManagerVO" resultClass="siteManagerVO">
+            /*	siteManagerDAO.selectSiteManagerList	*/
             SELECT
             	COUNT(*) OVER() AS sTotCnt,
-				TO_CHAR(A.FRST_REGIST_PNTTM, '%Y-%m-%d') frstRegistPnttm ,
+				TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYY-MM-DD') frstRegistPnttm ,
 				A.FRST_REGIST_PNTTM AS sortTempNo,
 				A.LAST_UPDUSR_ID AS lastUpdusrId,
-				TO_CHAR(A.LAST_UPDT_PNTTM, '%Y-%m-%d') lastUpdtPnttm ,
+				TO_CHAR(A.LAST_UPDT_PNTTM, 'YYYY-MM-DD') lastUpdtPnttm ,
 				A.THEME AS theme,
 				B.CODE_NM AS themeTxt,
 		        A.THEME_SMPL_USE AS   themeSmplUse,
@@ -157,14 +158,20 @@
 				 	SITE_NM LIKE CONCAT('%' , #searchKeyword#, '%')
                 </isEqual>
             </isNotEmpty>
+            /*
             ORDER BY 1=1
+            */
+            ORDER BY 1
             <isNotEmpty property="searchSortCnd">
   				,$searchSortCnd$
   			</isNotEmpty>
   			<isNotEmpty property="searchSortOrd">
   			 	$searchSortOrd$
   			</isNotEmpty>
-             LIMIT #recordCountPerPage# OFFSET #firstIndex#
+  			/*
+             LIMIT recordCountPerPage OFFSET firstIndex
+             */
+             OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
     </select>
 
     <select id="siteManagerDAO.selectSiteManagerListTotCnt" parameterClass="siteManagerVO" resultClass="int">

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

@@ -135,6 +135,7 @@
 		
 	<!-- 강사 정보 L page -->
 	<select id="VEEduMIXDAO.selectPagingList" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
+		/*	VEEduMIXDAO.selectPagingList	*/
 		SELECT
 			  COUNT(1) OVER() AS totCnt
 			, ROWNUM AS rowNo
@@ -344,7 +345,10 @@
 					                 ON       c0.prcs_onln_cntnt_ord = a0.prcs_onln_cntnt_ord
 					        WHERE    1                              =1
 					        AND      a0.edu_aplct_ord                =A.EDU_APLCT_ORD
-					        AND IFNULL(a0.sbmt_yn,'N')='Y'                 
+					        /*
+					        AND IFNULL(a0.sbmt_yn,'N')='Y'
+					        */                 
+					        AND NVL(a0.sbmt_yn,'N')='Y'
 			             
 			             )>0                 		 
                  		
@@ -363,17 +367,26 @@
 					                 ON       c0.prcs_onln_cntnt_ord = a0.prcs_onln_cntnt_ord
 					        WHERE    1                              =1
 					        AND      a0.edu_aplct_ord                =A.EDU_APLCT_ORD
-					        AND IFNULL(a0.sbmt_yn,'N')='Y'                 
+					        /*
+					        AND IFNULL(a0.sbmt_yn,'N')='Y'
+					        */                 
+					        AND NVL(a0.sbmt_yn,'N')='Y'
 			             
 			             )>0   
 			             and length(g.edu_strt_dt)=8              		 
 			             and length(g.edu_end_dt)=8
-                 		
+                 		/*
 						, CONCAT(
 									SUBSTRING(g.edu_strt_dt,1,4), '.', SUBSTRING(g.edu_strt_dt,5,2), '.', SUBSTRING(g.edu_strt_dt,7,2)
 									, '~'
 									, SUBSTRING(g.edu_end_dt,1,4), '.', SUBSTRING(g.edu_end_dt,5,2), '.', SUBSTRING(g.edu_end_dt,7,2)
-								)                 		
+								)
+								*/
+						, 
+									SUBSTRING(g.edu_strt_dt,1,4) || '.' || SUBSTRING(g.edu_strt_dt,5,2) || '.' || SUBSTRING(g.edu_strt_dt,7,2)
+									|| '~'
+									|| SUBSTRING(g.edu_end_dt,1,4) || '.' || SUBSTRING(g.edu_end_dt,5,2) || '.' || SUBSTRING(g.edu_end_dt,7,2)
+															                 		
                  		/*
                  		, CONCAT(
                  			DATE_FORMAT(TO_DATE(g.edu_strt_dt,'yyyymmdd'),'%Y.%m.%d')
@@ -431,14 +444,22 @@
 							
 			                 LEFT OUTER JOIN 
 			                 (
+			                 /*
 													SELECT edu_aplct_ord, edu_strt_dt, edu_end_dt , DATE_FORMAT(sbmt_pnttm,'%Y%m%d') AS edu_reg_dt
 													FROM ve_prcs_cmplt_detail
-													GROUP BY edu_aplct_ord, edu_strt_dt, edu_end_dt , DATE_FORMAT(sbmt_pnttm,'%Y%m%d')                 
+													GROUP BY edu_aplct_ord, edu_strt_dt, edu_end_dt , DATE_FORMAT(sbmt_pnttm,'%Y%m%d')
+													*/
+													SELECT edu_aplct_ord, edu_strt_dt, edu_end_dt , TO_CHAR(sbmt_pnttm,'YYYYMMDD') AS edu_reg_dt
+													FROM ve_prcs_cmplt_detail
+													GROUP BY edu_aplct_ord, edu_strt_dt, edu_end_dt , TO_CHAR(sbmt_pnttm,'YYYYMMDD')													                 
 			                 ) G
 			                 ON       A.EDU_APLCT_ORD = G.EDU_APLCT_ORD							
 							
 		WHERE 1=1
+		/*
 		AND IFNULL(A.USE_YN, 'Y') <![CDATA[ <> ]]> 'N'
+		*/
+		AND NVL(A.USE_YN, 'Y') <![CDATA[ <> ]]> 'N'
 
 		<isEmpty property="sbmtYn">
 			AND A.SBMT_YN = 'Y'
@@ -771,8 +792,12 @@
 		<isNotEmpty property="searchFullName">
 		/*교육콘텐츠 신청자 검색*/
 			AND (
-					A.FULL_NAME like concat('%', #searchFullName#, '%') 
+			/*
-				OR A.BLNG like concat('%', #searchFullName#, '%')			
+					A.FULL_NAME like concat('%', searchFullName, '%') 
+				OR A.BLNG like concat('%', searchFullName, '%')		
+				*/
+					A.FULL_NAME like '%'||#searchFullName#||'%' 
+				OR A.BLNG like '%'||#searchFullName#||'%'					
 				)
 
 		</isNotEmpty>
@@ -781,17 +806,24 @@
 			AND A.ADMIN_UPDT_YN = 'Y'
 		</isEqual>
 			
+		/*
 		ORDER BY 1=1
+		*/
+		ORDER BY 1
 		<isNotEmpty property="orderByQuery">
 			, $orderByQuery$
 		</isNotEmpty>
 		<isNotEqual property="mode" compareValue="EXCEL">
-			LIMIT #recordCountPerPage# OFFSET #firstIndex#
+		/*
+			LIMIT recordCountPerPage OFFSET firstIndex
+			*/
+			OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
 		</isNotEqual>
 	</select>
 		
 	<!-- 성인 찾아가는 저작권교육 교육배치확정관리 목록 -->
 	<select id="VEEduMIXDAO.selectAdultPagingList" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
+		/*	VEEduMIXDAO.selectAdultPagingList	*/
 		SELECT
 			  COUNT(1) OVER() AS totCnt
 			, ROWNUM AS rowNo

src/main/resources/egovframework/sqlmap/ve/sttst/VESttst_MIX_SQL_Tibero.xml

@@ -125,6 +125,7 @@
 		
 	<!-- 강사 정보 L page -->
 	<select id="VESttstMIXDAO.selectPagingList" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
+		/*	VESttstMIXDAO.selectPagingList	*/
 		SELECT
 			  COUNT(1) OVER() AS totCnt
 			, ROWNUM AS rowNo
@@ -412,7 +413,10 @@
 		<isNotEmpty property="eduAplctOrd">
 			AND A.EDU_APLCT_ORD = #eduAplctOrd#
 		</isNotEmpty>
+		/*
 		ORDER BY 1=1
+		*/
+		ORDER BY 1
 		<isEmpty property="orderByQuery">
 			, A.EDU_APLCT_ORD DESC
 		</isEmpty>
@@ -420,7 +424,10 @@
 			, $orderByQuery$
 		</isNotEmpty>
 		<isNotEqual property="mode" compareValue="EXCEL">
-			LIMIT #recordCountPerPage# OFFSET #firstIndex#
+		/*
+			LIMIT recordCountPerPage OFFSET firstIndex
+			*/
+			OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
 		</isNotEqual>
 	</select>