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 0ccbdcc4..2b1e0c84 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 @@ -128,7 +128,10 @@ public class UserInfo extends BaseModel implements UserDetails{ private Integer crc006Sum; @Transient @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") - private LocalDateTime lastWrtDt; + private LocalDateTime lastCareerWrtDt; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + private LocalDateTime lastEduWrtDt; @Transient private List accessConfigList; diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml index 1c5cb9a5..b2b70290 100644 --- a/src/main/resources/mybatisMapper/UserInfoMapper.xml +++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml @@ -123,6 +123,7 @@ 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, @@ -132,20 +133,27 @@ b.crc004Sum, b.crc005Sum, b.crc006Sum, - b.lastWrtDt + b.lastCareerWrtDt, + c.lastEduWrtDt from user_info a left outer join ( select user_seq, - sum(case when career_cd = 'CRC001' then work_month else 0 end) as crc001Sum, - sum(case when career_cd = 'CRC002' then work_month else 0 end) as crc002Sum, - sum(case when career_cd = 'CRC003' then work_month else 0 end) as crc003Sum, - sum(case when career_cd = 'CRC004' then work_month else 0 end) as crc004Sum, - sum(case when career_cd = 'CRC005' then work_month else 0 end) as crc005Sum, - sum(case when career_cd = 'CRC006' then work_month else 0 end) as crc006Sum, - max(wrt_dt) as lastWrtDt + sum(case when career_cd = 'CRC001' then work_month else 0 end) as crc001Sum, + sum(case when career_cd = 'CRC002' then work_month else 0 end) as crc002Sum, + sum(case when career_cd = 'CRC003' then work_month else 0 end) as crc003Sum, + sum(case when career_cd = 'CRC004' then work_month else 0 end) as crc004Sum, + sum(case when career_cd = 'CRC005' then work_month else 0 end) as crc005Sum, + sum(case when career_cd = 'CRC006' then work_month else 0 end) as crc006Sum, + max(wrt_dt) as lastCareerWrtDt 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 order by rownum desc diff --git a/src/main/resources/templates/police/career/careerMgt.html b/src/main/resources/templates/police/career/careerMgt.html index aebdfd24..bf3d320e 100644 --- a/src/main/resources/templates/police/career/careerMgt.html +++ b/src/main/resources/templates/police/career/careerMgt.html @@ -102,7 +102,11 @@ - + + + + + @@ -157,7 +161,7 @@ - + diff --git a/src/main/resources/templates/police/education/educationMgt.html b/src/main/resources/templates/police/education/educationMgt.html index 37fe14fd..d0af3bda 100644 --- a/src/main/resources/templates/police/education/educationMgt.html +++ b/src/main/resources/templates/police/education/educationMgt.html @@ -87,27 +87,30 @@ 직책 계급 성명 - 생년월일 성별 최종수정일 - + - + - - - - - - - - + + + + + + + + + + + + - +