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 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 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 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 order by rownum desc @@ -198,6 +177,98 @@ ) a + + + +