From 9be281becd70a0a89f712b027792f07aff5f1c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Wed, 13 Apr 2022 17:55:55 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=99=B8=EC=82=AC=EA=B2=BD=EC=B0=B0=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=BF=BC?=
 =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95(/admin/faMemberCmmnList.do)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmapper/mappers/member/member.xml       | 156 ++++++------------
 .../sqlmapper/mappers/report/report.xml       |  13 +-
 2 files changed, 53 insertions(+), 116 deletions(-)

diff --git a/src/main/resources/sqlmapper/mappers/member/member.xml b/src/main/resources/sqlmapper/mappers/member/member.xml
index 88c1750..429a1d8 100644
--- a/src/main/resources/sqlmapper/mappers/member/member.xml
+++ b/src/main/resources/sqlmapper/mappers/member/member.xml
@@ -233,114 +233,54 @@
 	</select>
 	
 	<select id="Member.getFaMemberList" parameterType="memberSearchVO" resultType="memberVO">
-	<![CDATA[
-		SELECT 
-			*
-		FROM (
-			SELECT 
-				ROWNUM RNUM, MEMBER_LIST.*
-			FROM (
-				SELECT 
-					MEMBER_LIST.PLACE1STR || ' ' || MEMBER_LIST.PLACE2STR AS PLACE3STR, MEMBER_LIST.*, TOTALEXCAREER_Y || '년 ' || TOTALEXCAREER_M || '개월' TOTALCAREER
-				FROM
-					(
-					SELECT
-					  B.CODENM AS PLACE2STR, A.*
-					FROM
-					  (SELECT 
-					    B.CODENM AS POSITIONSTR, A.*
-					  FROM
-					    (SELECT
-						  B.CODENM AS PLACE1STR, A.*
-						FROM
-						  (SELECT 
-						  	B.CODENM AS JOBTYPESTR, A.*  
-						  FROM
-						  	(
-						  		SELECT
-								  TAGENT.*,
-								  MOD((EXCAREER_M + EXCAREER1_M + EXCAREER2_M + EXCAREER3_M), 12) TOTALEXCAREER_M,
-								  (EXCAREER_Y + EXCAREER1_Y + EXCAREER2_Y + EXCAREER3_Y) + FLOOR(MOD((EXCAREER_M + EXCAREER1_M + EXCAREER2_M + EXCAREER3_M), 12) / 12) TOTALEXCAREER_Y
-								FROM (
-								  SELECT
-								   TAGENT.*,
-								   SUBSTR(EXCAREER, 1, INSTR(EXCAREER, '-', 1) - 1) EXCAREER_Y, 
-								   SUBSTR(EXCAREER, INSTR(EXCAREER, '-', 1) + 1, 3) EXCAREER_M,
-								   SUBSTR(EXCAREER1, 1, INSTR(EXCAREER1, '-', 1) - 1) EXCAREER1_Y, 
-								   SUBSTR(EXCAREER1, INSTR(EXCAREER1, '-', 1) + 1, 3) EXCAREER1_M,
-								   SUBSTR(EXCAREER2, 1, INSTR(EXCAREER2, '-', 1) - 1) EXCAREER2_Y, 
-								   SUBSTR(EXCAREER2, INSTR(EXCAREER2, '-', 1) + 1, 3) EXCAREER2_M,
-								   SUBSTR(EXCAREER3, 1, INSTR(EXCAREER3, '-', 1) - 1) EXCAREER3_Y, 
-								   SUBSTR(EXCAREER3, INSTR(EXCAREER3, '-', 1) + 1, 3) EXCAREER3_M
-								  FROM
-								    TAGENT 
-								) TAGENT
-						  	) A,
-						    TCODE B
-						  WHERE
-						  	B.CODE1(+) = 'C003' AND
-						  	A.JOBTYPE = B.CODE2(+)) A, 
-						  TCODE B
-						WHERE
-							A.PLACE1 = B.CODE2(+) AND
-						    B.CODE1(+) = 'C001' ) A,
-					    TCODE B
-					  WHERE    
-					    A.POSITION = B.CODE2(+) AND
-					    B.CODE1(+) = 'C002') A,
-					  TCODE B
-					WHERE    
-					  A.PLACE1 = B.CODE1(+) AND
-					  A.PLACE2 = B.CODE2(+)
-					ORDER BY ]]>
-					<if test="orderkey != null and orderkey != ''">
-						<choose>
-							<when test="ordercode == 7">
-								TOTALEXCAREER_Y <choose><when test="ordertype == 1">DESC</when><otherwise>ASC</otherwise></choose>, 
-								TOTALEXCAREER_M <choose><when test="ordertype == 1">DESC</when><otherwise>ASC</otherwise></choose>,
-							</when>
-							<otherwise>
-								${orderkey} <choose><when test="ordertype == 1">DESC</when><otherwise>ASC</otherwise></choose>,
-							</otherwise>
-						</choose>
-					</if>
-						 PLACE1, 
-						 PLACE2, 
-						 PLACE3, 
-						 POSITION DESC, 
-						 DUTIES, 
-						 NAME
-		<![CDATA[) MEMBER_LIST
-				WHERE
-					1 = 1
-	]]>
-				<if test="place1 != null and place1 != ''">
-					AND	PLACE1 = #{place1}
-				</if>
-		    	<if test="name != null and name != ''">
-					AND	NAME LIKE '%' || #{name} || '%'
-				</if>
-	<![CDATA[
-			) MEMBER_LIST
-		) A 
-		LEFT JOIN
-			(
-			  SELECT
-			    IO_USERID, TO_CHAR(MAX(IO_REGDATE), 'YYYY-MM-DD HH24:MI:SS') AS RECENTDATE
-			  FROM
-			    H3_LOGINOUT_LOG
-			  GROUP BY
-			    IO_USERID
-			) B
-		ON
-			A.USERID = B.IO_USERID
-		WHERE
-			A.RNUM  > #{firstIndex} AND  
-	  		A.RNUM <= #{firstIndex} + #{recordCountPerPage}
-	  	ORDER BY
-	  		A.RNUM
-	]]>
-	
+    select (ROW_NUMBER() OVER()) AS RNUM,
+          (aa.PLACE1STR || ' ' || aa.PLACE2STR) PLACE3STR,
+          TOTALEXCAREER_Y || '년 ' || TOTALEXCAREER_M || '개월' TOTALCAREER,
+          aa.*
+    from (select pl1.codenm place1str,
+                pl2.codenm PLACE2STR,
+                pst.codenm POSITIONSTR,
+                jt.codenm JOBTYPESTR,
+                MOD((EXCAREER_M + EXCAREER1_M + EXCAREER2_M + EXCAREER3_M), 12) TOTALEXCAREER_M,
+                (EXCAREER_Y + EXCAREER1_Y + EXCAREER2_Y + EXCAREER3_Y) + FLOOR(MOD((EXCAREER_M + EXCAREER1_M + EXCAREER2_M + EXCAREER3_M), 12) / 12) TOTALEXCAREER_Y,
+                a.*
+          from (select *,
+                      split_part(EXCAREER, '-', 1)::int EXCAREER_Y,
+                      split_part(EXCAREER, '-', 2)::int EXCAREER_M,
+                      split_part(EXCAREER1, '-', 1)::int EXCAREER1_Y,
+                      split_part(EXCAREER1, '-', 2)::int EXCAREER1_M,
+                      split_part(EXCAREER2, '-', 1)::int EXCAREER2_Y,
+                      split_part(EXCAREER2, '-', 2)::int EXCAREER2_M,
+                      split_part(EXCAREER3, '-', 1)::int EXCAREER3_Y,
+                      split_part(EXCAREER3, '-', 2)::int EXCAREER3_M
+                from tagent
+                <where>
+                  <if test="name != null and name != ''">
+                    AND	NAME LIKE '%' || #{name} || '%'
+                  </if>
+                  <if test="place1 != null and place1 != ''">
+                    AND	PLACE1 = #{place1}
+                  </if>
+                </where>
+                ORDER BY
+                  <if test="orderkey != null and orderkey != ''">
+                    <choose>
+                      <when test="ordercode == 7">
+                        TOTALEXCAREER_Y <choose><when test="ordertype == 1">DESC</when><otherwise>ASC</otherwise></choose>,
+                        TOTALEXCAREER_M <choose><when test="ordertype == 1">DESC</when><otherwise>ASC</otherwise></choose>,
+                      </when>
+                      <otherwise>
+                        ${orderkey} <choose><when test="ordertype == 1">DESC</when><otherwise>ASC</otherwise></choose>,
+                      </otherwise>
+                    </choose>
+                  </if>
+                  PLACE1, PLACE2, PLACE3, POSITION DESC, DUTIES, NAME
+                limit #{recordCountPerPage} offset #{firstIndex}) a
+                    inner join tcode pl1 on pl1.code1 = 'C001' and a.place1 = pl1.code2
+                    inner join tcode pl2 on a.place1 = pl2.code1 and a.place2 = pl2.code2
+                    inner join tcode pst on pst.code1 = 'C002' and a.position  = pst.code2
+                    inner join tcode jt on jt.code1 = 'C003' and a.jobtype = jt.code2
+          ) aa
 	</select>
 	
 	<select id="Member.getCmmnListAll" parameterType="memberSearchVO" resultType="memberVO">
diff --git a/src/main/resources/sqlmapper/mappers/report/report.xml b/src/main/resources/sqlmapper/mappers/report/report.xml
index d32f2c4..cd46f82 100644
--- a/src/main/resources/sqlmapper/mappers/report/report.xml
+++ b/src/main/resources/sqlmapper/mappers/report/report.xml
@@ -949,15 +949,12 @@
             cat4.name AS inCategory4Str,
             a.*
     from (
-      select
-        (IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
-        RPT.*
-      FROM
-        RPT_INFO RPT
-      WHERE
-        IN_STATE_CODE != '99'
+      select (IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
+             RPT.*
+      FROM RPT_INFO RPT
+      WHERE IN_STATE_CODE != '99'
         AND IN_TYPE = #{type}
-    <choose>
+        <choose>
           <when test="type != null and type == '1'">
             AND IN_USERID = #{userid}
           </when>

From 3389346ca3bc180d503dc26f5aae504de3d1f208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Thu, 14 Apr 2022 18:00:14 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=99=B8=EC=82=AC=EA=B2=BD=EC=B0=B0=20>=20?=
 =?UTF-8?q?=EC=A0=95=EC=9B=90/=ED=9B=A4=EC=9B=90=20=ED=98=84=ED=99=A9=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80,=20=EA=B3=BC=EA=B1=B0=EC=99=B8?=
 =?UTF-8?q?=EC=82=AC=EA=B2=BD=EC=B0=B0=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmapper/mappers/member/member.xml       | 80 ++++++++-----------
 .../WEB-INF/jsp/fa/memberManagePersonnel.jsp  | 40 +++++-----
 2 files changed, 52 insertions(+), 68 deletions(-)

diff --git a/src/main/resources/sqlmapper/mappers/member/member.xml b/src/main/resources/sqlmapper/mappers/member/member.xml
index 429a1d8..bb014d5 100644
--- a/src/main/resources/sqlmapper/mappers/member/member.xml
+++ b/src/main/resources/sqlmapper/mappers/member/member.xml
@@ -940,53 +940,37 @@
 	</select>
 	
 	<select id="Member.exmemberList" parameterType="memberSearchVO" resultType="memberVO">
-	<![CDATA[
-		SELECT 
-				*
-			FROM (
-			SELECT 
-				ROWNUM RNUM, MEMBER_LIST.*
-			FROM (
-				SELECT 
-					MEMBER_LIST.*
-				FROM
-					(SELECT
-							(SELECT CODENM FROM TCODE WHERE CODE1 = 'C001' AND CODE2 = EA.PLACE1) AS PLACE1STR,
-							(SELECT CODENM FROM TCODE WHERE CODE1 = 'C002' AND CODE2 = EA.POSITION) AS POSITIONSTR,
-							(SELECT CODENM FROM TCODE WHERE CODE1 = EA.PLACE1 AND CODE2 = EA.PLACE2) AS PLACE2STR,
-							(SELECT CODENM FROM TCODE WHERE CODE1 = 'C001' AND CODE2 = EA.NOWPLACE) AS NOWPLACESTR,
-							(SELECT CODENM FROM TCODE WHERE CODE1 = 'C002' AND CODE2 = EA.NOWPOSITION) AS NOWPOSITIONSTR,
-							EA.*
-						FROM 
-							TEXAGENT EA
-					ORDER BY ]]>
-					<if test="orderkey != null and orderkey != ''">
-						${orderkey} <choose><when test="ordertype == 1">DESC</when><otherwise>ASC</otherwise></choose>,
-					</if>
-						 PLACE1, 
-						 POSITION, 
-						 USERID
-			<![CDATA[) MEMBER_LIST
-					WHERE
-						1 = 1
-		]]>
-				<if test="place1 != null and place1 != ''">
-					AND	PLACE1 = #{place1}
-				</if>
-				<if test="position != null and position != ''">
-					AND	Position = #{position}
-				</if>
-		    	<if test="name != null and name != ''">
-					AND	NAME LIKE '%' || #{name} || '%'
-				</if>
-		<![CDATA[
-			) MEMBER_LIST 
-		) WHERE
-			RNUM  > #{firstIndex} AND  
-	  		RNUM <= #{firstIndex} + #{recordCountPerPage}
-	  	ORDER BY
-	  		RNUM
-	]]>
+    SELECT
+        (ROW_NUMBER() OVER()) RNUM,
+        MEMBER_LIST.*
+    FROM (SELECT MEMBER_LIST.*
+          FROM (SELECT
+                  (SELECT CODENM FROM TCODE WHERE CODE1 = 'C001' AND CODE2 = EA.PLACE1) AS PLACE1STR,
+                  (SELECT CODENM FROM TCODE WHERE CODE1 = 'C002' AND CODE2 = EA.POSITION) AS POSITIONSTR,
+                  (SELECT CODENM FROM TCODE WHERE CODE1 = EA.PLACE1 AND CODE2 = EA.PLACE2) AS PLACE2STR,
+                  (SELECT CODENM FROM TCODE WHERE CODE1 = 'C001' AND CODE2 = EA.NOWPLACE) AS NOWPLACESTR,
+                  (SELECT CODENM FROM TCODE WHERE CODE1 = 'C002' AND CODE2 = EA.NOWPOSITION) AS NOWPOSITIONSTR,
+                  EA.*
+                FROM TEXAGENT EA
+                <where>
+                  <if test="place1 != null and place1 != ''">
+                    AND	PLACE1 = #{place1}
+                  </if>
+                  <if test="position != null and position != ''">
+                    AND	Position = #{position}
+                  </if>
+                  <if test="name != null and name != ''">
+                    AND	NAME LIKE '%' || #{name} || '%'
+                  </if>
+                </where>
+                ORDER by
+                      <if test="orderkey != null and orderkey != ''">
+                        ${orderkey} <choose><when test="ordertype == 1">DESC</when><otherwise>ASC</otherwise></choose>,
+                      </if>
+                      PLACE1, POSITION, USERID
+                limit #{recordCountPerPage} offset #{firstIndex}
+                ) MEMBER_LIST
+          ) MEMBER_LIST
 	</select>
 	
 	<select id="Member.selectExmemberTotalCnt" parameterType="memberSearchVO" resultType="int">
@@ -1028,7 +1012,7 @@
 		VALUES (
 			#{userid}, #{place1}, #{excareer_y}, #{excareer_m},
 			#{excareer1_y}, #{excareer1_m}, #{excareer2_y}, #{excareer2_m}, #{excareer3_y}, #{excareer3_m},
-      NOW(), NOW()
+      NOW(), to_char(now(), 'YY/MM/DD')
 		) 
 	]]>
 	</insert>
diff --git a/src/main/webapp/WEB-INF/jsp/fa/memberManagePersonnel.jsp b/src/main/webapp/WEB-INF/jsp/fa/memberManagePersonnel.jsp
index e3ca5cf..1b255cc 100644
--- a/src/main/webapp/WEB-INF/jsp/fa/memberManagePersonnel.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fa/memberManagePersonnel.jsp
@@ -15,7 +15,7 @@
 	</div>
 </form>
 
-<div id="table">	
+<div id="table">
 	<table class="tbl_listview2" width="100%" border="0" cellpadding="0" cellspacing="0">
 		<colgroup>
    			<col width="176"/>
@@ -75,24 +75,24 @@
 		<tbody>
 			<c:forEach items="${resultList}" var="item">
 			<tr>
-				<td align="left"><c:out value="${item.CODENM}"/></td>
-				<td align="right"><c:out value="${item.TOT_CNT}"/></td>
-				<td align="right"><c:out value="${item.CURRENT_CNT}"/></td>
-				<td align="right"><c:out value="${item.EXCESS}"/></td>
-				<td align="right"><c:out value="${item.POSITION204}"/></td>
-				<td align="right"><c:out value="${item.CNT_204}"/></td>
-				<td align="right"><c:out value="${item.POSITION203}"/></td>
-				<td align="right"><c:out value="${item.CNT_203}"/></td>
-				<td align="right"><c:out value="${item.POSITION202}"/></td>
-				<td align="right"><c:out value="${item.CNT_202}"/></td>
-				<td align="right"><c:out value="${item.POSITION201}"/></td>
-				<td align="right"><c:out value="${item.CNT_201}"/></td>
-				<td align="right"><c:out value="${item.POSITION104}"/></td>
-				<td align="right"><c:out value="${item.CNT_104}"/></td>
-				<td align="right"><c:out value="${item.POSITION103}"/></td>
-				<td align="right"><c:out value="${item.CNT_103}"/></td>
-				<td align="right"><c:out value="${item.POSITION102}"/></td>
-				<td align="right"><c:out value="${item.CNT_102}"/></td>
+				<td align="left"><c:out value="${item.codenm}"/></td>
+				<td align="right"><c:out value="${item.tot_cnt}"/></td>
+				<td align="right"><c:out value="${item.current_cnt}"/></td>
+				<td align="right"><c:out value="${item.excess}"/></td>
+				<td align="right"><c:out value="${item.position204}"/></td>
+				<td align="right"><c:out value="${item.cnt_204}"/></td>
+				<td align="right"><c:out value="${item.position203}"/></td>
+				<td align="right"><c:out value="${item.cnt_203}"/></td>
+				<td align="right"><c:out value="${item.position202}"/></td>
+				<td align="right"><c:out value="${item.cnt_202}"/></td>
+				<td align="right"><c:out value="${item.position201}"/></td>
+				<td align="right"><c:out value="${item.cnt_201}"/></td>
+				<td align="right"><c:out value="${item.position104}"/></td>
+				<td align="right"><c:out value="${item.cnt_104}"/></td>
+				<td align="right"><c:out value="${item.position103}"/></td>
+				<td align="right"><c:out value="${item.cnt_103}"/></td>
+				<td align="right"><c:out value="${item.position102}"/></td>
+				<td align="right"><c:out value="${item.cnt_102}"/></td>
 			</tr>			
 			</c:forEach>
 		</tbody>
@@ -109,7 +109,7 @@
     /* 엑셀 다운로드 function */
     function fn_goExcel() {
        	document.searchForm.method = "post";
-       	document.searchForm.action = "<c:url value='/fa//memberManagePersonnelExcel.do'/>";
+       	document.searchForm.action = "<c:url value='/fa/memberManagePersonnelExcel.do'/>";
        	document.searchForm.submit();
     }
 	//-->