From 1ea93f8c081d4a86302f6a1aaa03d289b1486ef9 Mon Sep 17 00:00:00 2001
From: TaehunPark <qkrxogns21@gmail.com>
Date: Mon, 30 Jan 2023 10:38:34 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=99=B8=EC=82=AC=EA=B2=BD=EC=B0=B0?=
 =?UTF-8?q?=20=EA=B5=90=EC=9C=A1=ED=98=84=ED=99=A9=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EA=B5=90=EC=9C=A1=EB=AA=85=20=EA=B5=90=EC=9C=A1?=
 =?UTF-8?q?=EC=9D=BC=20=EB=8B=B4=EB=8B=B9=EA=B8=B0=EA=B4=80=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=2014=EB=B2=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../faisp/main/userInfo/PoliceController.java |   4 +-
 .../main/userInfo/mapper/UserInfoMapper.java  |   4 +
 .../faisp/main/userInfo/model/UserInfo.java   |   8 ++
 .../userInfo/service/UserInfoService.java     |   8 ++
 .../mybatisMapper/UserInfoMapper.xml          | 115 ++++++++++++++----
 .../police/education/educationMgt.html        |  10 +-
 6 files changed, 124 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java b/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java
index 580dde38..c35ea937 100644
--- a/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java
+++ b/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java
@@ -279,8 +279,8 @@ public class PoliceController {
     String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/police/educationMgt").get(0).getAccessAuth();
     mav.addObject("accessAuth", accessAuth);
     userInfo.setQueryInfo();
-    mav.addObject("policeList", userInfoService.selectPoliceList(userInfo));
-    userInfo.setContentCnt(userInfoService.selectPoliceListCnt(userInfo));
+    mav.addObject("policeList", userInfoService.selectPoliceEducationList(userInfo));
+    userInfo.setContentCnt(userInfoService.selectPoliceEducationListCnt(userInfo));
     userInfo.setPaginationInfo();
     mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
     mav.addObject("userStatus", userInfo.getUserStatus());
diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/mapper/UserInfoMapper.java b/src/main/java/com/dbnt/faisp/main/userInfo/mapper/UserInfoMapper.java
index e998c730..15d60e2e 100644
--- a/src/main/java/com/dbnt/faisp/main/userInfo/mapper/UserInfoMapper.java
+++ b/src/main/java/com/dbnt/faisp/main/userInfo/mapper/UserInfoMapper.java
@@ -45,4 +45,8 @@ public interface UserInfoMapper {
   Integer selectAlarmListCnt(UserAlarm userAlarm);
 
   Integer selectUserInfo(UserInfo ui);
+
+  List<UserInfo> selectPoliceEducationList(UserInfo userInfo);
+
+  Integer selectPoliceEducationListCnt(UserInfo userInfo);
 }
diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java
index 2b1e0c84..7303824f 100644
--- a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java
+++ b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java
@@ -132,6 +132,14 @@ public class UserInfo extends BaseModel implements UserDetails{
   @Transient
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
   private LocalDateTime lastEduWrtDt;
+  @Transient
+  private String eduName;
+  @Transient
+  private String eduSdate;
+  @Transient
+  private String eduEdate;
+  @Transient
+  private String eduRa;
 
   @Transient
   private List<AccessConfig> accessConfigList;
diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java b/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java
index 113c07f8..c2b2871f 100644
--- a/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java
+++ b/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java
@@ -247,5 +247,13 @@ public class UserInfoService implements UserDetailsService {
 	  dbUser.setPassword(convertPassword(ui.getPassword()));
 	return userInfoRepository.save(dbUser).getUserSeq();
   }
+  
+  public List<UserInfo> selectPoliceEducationList(UserInfo userInfo) {
+	  return userInfoMapper.selectPoliceEducationList(userInfo);
+  }
+  
+  public Integer selectPoliceEducationListCnt(UserInfo userInfo) {
+	  return userInfoMapper.selectPoliceEducationListCnt(userInfo);
+  }
 
 }
diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml
index fcd61080..0ade8271 100644
--- a/src/main/resources/mybatisMapper/UserInfoMapper.xml
+++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml
@@ -133,12 +133,7 @@
            b.crc004Sum,
            b.crc005Sum,
            b.crc006Sum,
-           b.lastCareerWrtDt,
-           c.lastEduWrtDt,
-           d.edu_name,
-           d.edu_sdate,
-           d.edu_edate,
-           d.edu_ra
+           b.lastCareerWrtDt
 	from user_info a
     left outer join (
       select user_seq,
@@ -152,22 +147,6 @@
       from user_career
       group by user_seq
     ) b on a.user_seq = b.user_seq
-    left outer join (
-      select user_seq,
-             max(wrt_dt) as lastEduWrtDt
-      from user_edu
-      group by user_seq
-    ) c on a.user_seq = c.user_seq
-    left outer join (
-      select aa.user_seq,
-            aa.edu_seq,
-            aa.edu_name,
-            aa.edu_sdate,
-            aa.edu_edate,
-            aa.edu_ra
-      from user_edu aa inner join (select user_seq, max(edu_edate) as edu_edate from user_edu group by user_seq) ab
-      on aa.user_seq = ab.user_seq and aa.edu_edate = ab.edu_edate
-    ) d on a.user_seq = d.user_seq
     <include refid="selectPoliceListWhere"></include>
     order by rownum desc
     <if test='excel != "Y"'>
@@ -198,6 +177,98 @@
     ) a
   </select>
   
+  <select id="selectPoliceEducationList" resultType="UserInfo" parameterType="UserInfo">
+    select (ROW_NUMBER() OVER(order by user_nm desc)) AS rownum,
+           a.user_seq,
+           (select item_value from code_mgt where item_cd = title_cd) as title_cd,
+           user_nm,
+           og_cd,
+           (select item_value from code_mgt where item_cd = og_cd) as organ_nm,
+           (select item_value from code_mgt where item_cd = ofc_cd) as ofc_cd,
+           birth_date,
+           (select item_value from code_mgt where item_cd = sex) as sex,
+           police_in_date,
+           title_in_date,
+           ofc_in_date,
+           duty_cd,
+           (select item_value from code_mgt where item_cd = outturn_cd) as outturn_cd,
+           (select item_value from code_mgt where item_cd = job_in_cd) as job_in_cd,
+           wrt_dt,
+           b.lastEduWrtDt,
+           c.edu_name,
+           c.edu_sdate,
+           c.edu_edate,
+           c.edu_ra
+	from user_info a
+    left outer join (
+      select user_seq,
+             max(wrt_dt) as lastEduWrtDt
+      from user_edu
+      group by user_seq
+    ) b on a.user_seq = b.user_seq
+    left outer join (
+      select aa.user_seq,
+            aa.edu_seq,
+            aa.edu_name,
+            aa.edu_sdate,
+            aa.edu_edate,
+            aa.edu_ra
+      from user_edu aa inner join (select user_seq, max(edu_edate) as edu_edate from user_edu group by user_seq) ab
+      on aa.user_seq = ab.user_seq and aa.edu_edate = ab.edu_edate
+    ) c on a.user_seq = c.user_seq
+    <include refid="selectPoliceListWhere"></include>
+    order by rownum desc
+    <if test='excel != "Y"'>
+    limit #{rowCnt} offset #{firstIndex}
+    </if>
+  </select>
+  
+  <select id="selectPoliceEducationListCnt" resultType="Integer" parameterType="UserInfo">
+  select count(*)
+  from(
+	    select (ROW_NUMBER() OVER(order by user_nm desc)) AS rownum,
+	           a.user_seq,
+	           (select item_value from code_mgt where item_cd = title_cd) as title_cd,
+	           user_nm,
+	           og_cd,
+	           (select item_value from code_mgt where item_cd = og_cd) as organ_nm,
+	           (select item_value from code_mgt where item_cd = ofc_cd) as ofc_cd,
+	           birth_date,
+	           (select item_value from code_mgt where item_cd = sex) as sex,
+	           police_in_date,
+	           title_in_date,
+	           ofc_in_date,
+	           duty_cd,
+	           (select item_value from code_mgt where item_cd = outturn_cd) as outturn_cd,
+	           (select item_value from code_mgt where item_cd = job_in_cd) as job_in_cd,
+	           wrt_dt,
+	           b.lastEduWrtDt,
+	           c.edu_name,
+	           c.edu_sdate,
+	           c.edu_edate,
+	           c.edu_ra
+		from user_info a
+	    left outer join (
+	      select user_seq,
+	             max(wrt_dt) as lastEduWrtDt
+	      from user_edu
+	      group by user_seq
+	    ) b on a.user_seq = b.user_seq
+	    left outer join (
+	      select aa.user_seq,
+	            aa.edu_seq,
+	            aa.edu_name,
+	            aa.edu_sdate,
+	            aa.edu_edate,
+	            aa.edu_ra
+	      from user_edu aa inner join (select user_seq, max(edu_edate) as edu_edate from user_edu group by user_seq) ab
+	      on aa.user_seq = ab.user_seq and aa.edu_edate = ab.edu_edate
+	    ) c on a.user_seq = c.user_seq
+	    <include refid="selectPoliceListWhere"></include>
+	    order by rownum desc
+	)d
+  </select>
+  
   <select id="selectPoliceHisList" resultType="UserInfoHistory" parameterType="UserInfoHistory">
     select user_seq,
 		   version_no,
diff --git a/src/main/resources/templates/police/education/educationMgt.html b/src/main/resources/templates/police/education/educationMgt.html
index d0af3bda..3cac7a25 100644
--- a/src/main/resources/templates/police/education/educationMgt.html
+++ b/src/main/resources/templates/police/education/educationMgt.html
@@ -89,6 +89,9 @@
                         <th>성명</th>
                         <th>생년월일</th>
                         <th>성별</th>
+                        <th>교육명</th>
+                        <th>교육일</th>
+                        <th>담당기관</th>
                         <th>최종수정일</th>
                       </tr>
                       </thead>
@@ -109,7 +112,12 @@
                         <td th:text="${police.userNm}"></td>
                         <td th:text="${police.birthDate}"></td>
                         <td th:text="${police.sex}"></td>
-
+		  				<td th:text="${police.eduName}"></td>
+		  				<td>
+		  				<th:block th:if="${police.eduEdate eq null}"></th:block>
+		  				<th:block th:unless="${police.eduEdate eq null}" th:text="|${police.eduSdate}~${police.eduEdate}|"></th:block>
+		  				</td>
+		  				<td th:text="${police.eduRa}"></td>
                         <td th:text="${#temporals.format(police.lastEduWrtDt, 'yyyy-MM-dd')}"></td>
                       </tr>
                       </tbody>