From 6d2e105361c8be5cc3d84eb481adcbcafeadcf02 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Wed, 15 Nov 2023 12:31:27 +0900
Subject: [PATCH] =?UTF-8?q?2023-11-15=2012:31=20=EA=B2=8C=EC=8B=9C?=
 =?UTF-8?q?=ED=8C=90=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/OprtnInstrTngrPrflContoller.java      |  4 +-
 .../let/cop/bbs/EgovBBSMaster_SQL_Tibero.xml  | 45 ++++++++++++++-----
 .../let/sec/rmt/EgovRoleManage_SQL_Tibero.xml |  4 +-
 3 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java
index 8b9f0780..f67646ec 100644
--- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java
+++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java
@@ -1767,8 +1767,8 @@ public class OprtnInstrTngrPrflContoller {
 	    	t_vEInstrDetailVO.setAprvlCd(vEInstrDetailVO.getAprvlCd());
 	    	t_vEInstrDetailVO.setFirstIndex(0);
 	    	
-	    	//List<VELctrDetailVO> selectAsgnmInfoT2List = 	    	vEInstrMixService.selectAsgnmInfoT2(t_vEInstrDetailVO);
-	    	//model.addAttribute("asgnmInfoT2List",selectAsgnmInfoT2List);
+	    	List<VELctrDetailVO> selectAsgnmInfoT2List = 	    	vEInstrMixService.selectAsgnmInfoT2(t_vEInstrDetailVO);
+	    	model.addAttribute("asgnmInfoT2List",selectAsgnmInfoT2List);
 	    	
 			return "/oprtn/tngrVisitEdu/instrMngDetail";
 		}		
diff --git a/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Tibero.xml
index 1c82f3a1..d099a335 100644
--- a/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/let/cop/bbs/EgovBBSMaster_SQL_Tibero.xml
@@ -92,14 +92,25 @@
 	</resultMap>
 
 	<select id="BBSAttributeManageDAO.selectBBSMasterInfs" parameterClass="BoardMasterVO" resultMap="boardMasterList" >
+		/*	BBSAttributeManageDAO.selectBBSMasterInfs	*/
 		<![CDATA[
 			SELECT
 				a.BBS_ID, a.BBS_TY_CODE, b.CODE_NM as BBS_TY_CODE_NM,
 				a.BBS_ATTRB_CODE, c.CODE_NM as BBS_ATTRB_CODE_NM, a.BBS_NM,
-				a.TMPLAT_ID, a.USE_AT, IF(a.USE_AT = 'N', '미사용', '사용') USE_AT_TXT ,
-				DATE_FORMAT(a.FRST_REGIST_PNTTM, '%Y-%m-%d') as FRST_REGIST_PNTTM,
-				IFNULL(d.TOTCNT, 0) as TOTCNT, IFNULL(d.NEWCNT, 0) as NEWCNT, a.WRITE_YN,
-				if(e.MENU_NM='root' , '', e.MENU_NM) as MENU_NM
+				a.TMPLAT_ID, a.USE_AT, 
+				
+				a.WRITE_YN,
+				
+				
+                 DECODE(a.USE_AT , 'N', '미사용', '사용') USE_AT_TXT ,                
+                 TO_CHAR(a.FRST_REGIST_PNTTM, 'YYYY-MM-DD') AS FRST_REGIST_PNTTM,                 
+                 NVL(d.TOTCNT, 0)                          AS TOTCNT,
+                 NVL(d.NEWCNT, 0)                          AS NEWCNT,
+                 a.WRITE_YN,
+
+                 DECODE(e.MENU_NM,'root' , '', e.MENU_NM) AS MENU_NM                 
+                 				
+				
 			FROM
 				LETTNBBSMASTER a
 			LEFT OUTER JOIN
@@ -113,7 +124,17 @@
 			LEFT OUTER JOIN
 				(SELECT BBS_ID,
 						COUNT(1) AS TOTCNT,
+						/*
 						COUNT(IF(DATEDIFF(FRST_REGIST_PNTTM, NOW()) <= 7, BBS_ID, NULL)) as NEWCNT
+						*/
+						
+                       COUNT(
+                       		CASE 
+                       			WHEN CAST(FRST_REGIST_PNTTM AS date)- SYSDATE <= 7	THEN BBS_ID ELSE NULL
+                       		END
+                       		
+                       		) AS NEWCNT						
+						
 						/*COUNT(IF(TIMESTAMPDIFF(DAY, FRST_REGIST_PNTTM, NOW()) <= 7, BBS_ID, NULL)) as NEWCNT*/
 					FROM (SELECT BBS_ID, FRST_REGIST_PNTTM, USE_AT
 						FROM LETTNBBS WHERE USE_AT = 'Y') z GROUP BY z.BBS_ID
@@ -126,10 +147,10 @@
 				AND a.USE_AT = #useAt#
 			</isNotEmpty>
 			<isEqual prepend="AND" property="searchCnd" compareValue="0">
-				<![CDATA[(	a.BBS_NM LIKE CONCAT ('%', #searchWrd#,'%') or  MENU_NM LIKE CONCAT ('%', #searchWrd#,'%') )		]]>
+				<![CDATA[(	a.BBS_NM LIKE '%'||#searchWrd#||'%' or  MENU_NM LIKE '%'||#searchWrd#||'%' )		]]>
 			</isEqual>
 			<isEqual prepend="AND" property="searchCnd" compareValue="1">
-				<![CDATA[	b.CODE_NM LIKE CONCAT ('%', #searchWrd#,'%') 		]]>
+				<![CDATA[	b.CODE_NM LIKE '%'||#searchWrd#||'%' 		]]>
 			</isEqual>
 			<isNotEmpty prepend="AND" property="bbsMngId">
 				<![CDATA[	a.BBS_ID IN (SELECT BBS_ID FROM LETTNBBSMNG WHERE EMPLYR_ID = #bbsMngId#) 		]]>
@@ -140,7 +161,7 @@
 			<isNotEmpty property="seCmmnCdId">
 				AND a.SE_CMMN_CD_ID = #seCmmnCdId#
 			</isNotEmpty>
-			ORDER BY 1=1
+			ORDER BY 1
             <isNotEmpty property="searchSortCnd">
   				,$searchSortCnd$
   			</isNotEmpty>
@@ -175,10 +196,10 @@
 				AND a.USE_AT = #useAt#
 			</isNotEmpty>
 			<isEqual prepend="AND" property="searchCnd" compareValue="0">
-				<![CDATA[(	a.BBS_NM LIKE CONCAT ('%', #searchWrd#,'%') or  MENU_NM LIKE CONCAT ('%', #searchWrd#,'%') )		]]>
+				<![CDATA[(	a.BBS_NM LIKE '%'||#searchWrd#||'%' or  MENU_NM LIKE '%'||#searchWrd#||'%' )		]]>
 			</isEqual>
 			<isEqual prepend="AND" property="searchCnd" compareValue="1">
-				<![CDATA[	b.CODE_NM LIKE CONCAT ('%', #searchWrd#,'%') 		]]>
+				<![CDATA[	b.CODE_NM LIKE '%'||#searchWrd#||'%' 		]]>
 			</isEqual>
 			<isNotEmpty prepend="AND" property="bbsMngId">
 				<![CDATA[	a.BBS_ID IN (SELECT BBS_ID FROM LETTNBBSMNG WHERE EMPLYR_ID = #bbsMngId#) 		]]>
@@ -193,7 +214,7 @@
 			UPDATE LETTNBBSMASTER SET
 				USE_AT = 'N',
 				LAST_UPDUSR_ID = #lastUpdusrId#,
-				LAST_UPDT_PNTTM = NOW()
+				LAST_UPDT_PNTTM = SYSDATE
 			WHERE BBS_ID = #bbsId#
  		]]>
  	</update>
@@ -375,7 +396,7 @@
 			VALUES
 			( #bbsId#, #bbsTyCode#, #bbsAttrbCode#, #bbsNm#, #bbsIntrcn#,
 			  #replyPosblAt#, #fileAtchPosblAt#, #posblAtchFileNumber#,
-			  #posblAtchFileSize#, #tmplatId#, #useAt#, #frstRegisterId#, NOW(), #bbsDc#,
+			  #posblAtchFileSize#, #tmplatId#, #useAt#, #frstRegisterId#, SYSDATE, #bbsDc#,
 
 			  #listNum#, #pageNum#, #titleNum#,
 			  #addYn#, #noticeYn#, #passwordYn#, #openYn#,
@@ -490,7 +511,7 @@
 				ATCH_POSBL_FILE_SIZE = #posblAtchFileSize#,
 				TMPLAT_ID = #tmplatId#,
 				LAST_UPDUSR_ID = #lastUpdusrId#,
-				LAST_UPDT_PNTTM = NOW(),
+				LAST_UPDT_PNTTM = SYSDATE,
 				REPLY_POSBL_AT = #replyPosblAt#,
 				USE_AT = #useAt# ,
 				LIST_NUM = #listNum#,
diff --git a/src/main/resources/egovframework/sqlmap/let/sec/rmt/EgovRoleManage_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/sec/rmt/EgovRoleManage_SQL_Tibero.xml
index 81b7bfb3..d2f98b9f 100644
--- a/src/main/resources/egovframework/sqlmap/let/sec/rmt/EgovRoleManage_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/let/sec/rmt/EgovRoleManage_SQL_Tibero.xml
@@ -101,6 +101,7 @@
 	</insert>
 
 	<update id="roleManageDAO.updateRole" parameterClass="roleManage">
+		/*	roleManageDAO.updateRole	*/
 		<![CDATA[
 			UPDATE LETTNROLEINFO 
 			   SET ROLE_NM=#roleNm#
@@ -108,7 +109,8 @@
                  , ROLE_DC=#roleDc#
                  , ROLE_TY=#roleTyp#
                  , ROLE_SORT=#roleSort#
-				 , ROLE_CREAT_DE=DATE_FORMAT(NOW(), '%Y-%m-%d %T')
+				 , ROLE_CREAT_DE=TO_CHAR(SYSDATE, 'YYYY-MM-DD HH24')
+				 /*	DATE_FORMAT(NOW(), '%Y-%m-%d %T') 	*/
 		  	 WHERE ROLE_CODE=#roleCode#
 		]]>
 	</update>