diff --git a/WebContent/jsp/common/acl/user/userMan.jsp b/WebContent/jsp/common/acl/user/userMan.jsp
index f2a8629..a70dee0 100644
--- a/WebContent/jsp/common/acl/user/userMan.jsp
+++ b/WebContent/jsp/common/acl/user/userMan.jsp
@@ -40,16 +40,18 @@ $(document).ready(function() {
'<%= localeMessage.getString("user.roleName") %>',
'<%= localeMessage.getString("user.status") %>',
'<%= localeMessage.getString("user.createOn") %>',
+ '<%= localeMessage.getString("user.lastLoginYms") %>',
'<%= localeMessage.getString("user.depart") %>',
'<%= localeMessage.getString("user.teamName") %>',
'<%= localeMessage.getString("user.position") %>'
],
colModel:[
- { name : 'USERID' , align:'center' ,sortable:false },
- { name : 'USERNAME' , align:'center' },
- { name : 'ROLEIDNFINAME' , align:'center' },
- { name : 'STATUS' , align:'center', formatter: userStatusFormat },
- { name : 'LASTAMNDYMS' , align:'center', formatter: timeStampFormat },
+ { name : 'USERID' , align:'center', width: 100, sortable:false },
+ { name : 'USERNAME' , align:'center', width: 100 },
+ { name : 'ROLEIDNFINAME' , align:'center', width: 300 },
+ { name : 'STATUS' , align:'center', width: 80, formatter: userStatusFormat },
+ { name : 'REGDYMS' , align:'center', width: 120, formatter: timeStampFormat },
+ { name : 'LASTLOGINYMS' , align:'center', width: 120, formatter: timeStampFormat },
{ name : 'DVSNNAME' , align:'center', hidden: true },
{ name : 'TEAMNAME' , align:'center', hidden: true },
{ name : 'JOBTLNAME' , align:'center', hidden: true }
diff --git a/WebContent/jsp/common/acl/user/userManDetail.jsp b/WebContent/jsp/common/acl/user/userManDetail.jsp
index cd5202b..666a6b8 100644
--- a/WebContent/jsp/common/acl/user/userManDetail.jsp
+++ b/WebContent/jsp/common/acl/user/userManDetail.jsp
@@ -88,7 +88,8 @@ function detail(key){
$(tag+"[name="+name+"]").val(data[name.toUpperCase()] ? data[name.toUpperCase()].trim():"");
});
- $("input[name=LASTAMNDYMS]").inputmask("9999-99-99 99:99:99",{'autoUnmask':true});
+ $("input[name=REGDYMS]").inputmask("9999-99-99 99:99:99",{'autoUnmask':true});
+ $("input[name=LASTLOGINYMS]").inputmask("9999-99-99 99:99:99",{'autoUnmask':true});
/* $("input[name=SECONDMENTSTDT]").inputmask("9999-99-99",{'autoUnmask':true});
$("input[name=SECONDMENTENDT]").inputmask("9999-99-99",{'autoUnmask':true}); */
@@ -334,7 +335,10 @@ $(document).ready(function() {
<%= localeMessage.getString("user.fieldAgentName") %> | |
--%>
- | <%= localeMessage.getString("user.createOn") %> | |
+ <%= localeMessage.getString("user.createOn") %> | |
+
+
+ | <%= localeMessage.getString("user.lastLoginYms") %> | |
<%--
| <%= localeMessage.getString("user.secondmentbrncd") %> | |
diff --git a/src/main/java/com/eactive/eai/rms/common/acl/user/mapper/UserUIMapper.java b/src/main/java/com/eactive/eai/rms/common/acl/user/mapper/UserUIMapper.java
index 20c3015..2472e45 100644
--- a/src/main/java/com/eactive/eai/rms/common/acl/user/mapper/UserUIMapper.java
+++ b/src/main/java/com/eactive/eai/rms/common/acl/user/mapper/UserUIMapper.java
@@ -24,6 +24,8 @@ public interface UserUIMapper extends GenericMapper {
@Mapping(source = "secondmentstdt", target = "SECONDMENTSTDT")
@Mapping(source = "secondmentendt", target = "SECONDMENTENDT")
@Mapping(source = "allowip", target = "allowIp")
+ @Mapping(source = "lastloginyms", target = "LASTLOGINYMS")
+ @Mapping(source = "regdyms", target = "REGDYMS")
UserUI toVo(UserInfo entity);
@Override
diff --git a/src/main/java/com/eactive/eai/rms/common/acl/user/ui/UserUI.java b/src/main/java/com/eactive/eai/rms/common/acl/user/ui/UserUI.java
index 84085eb..52517ca 100644
--- a/src/main/java/com/eactive/eai/rms/common/acl/user/ui/UserUI.java
+++ b/src/main/java/com/eactive/eai/rms/common/acl/user/ui/UserUI.java
@@ -82,4 +82,14 @@ public class UserUI {
@JsonProperty("STATUS")
private String status; // 사용자계정상태
+
+ @JsonProperty("LASTLOGINYMS")
+ @JsonFormat(pattern = LocalDateTimeFormatters.FORMAT_YYYYMMDDHHMMSS_14)
+ @DateTimeFormat(pattern = "yyyyMMddHHmmss")
+ private LocalDateTime LASTLOGINYMS; // 최종로그인일시
+
+ @JsonProperty("REGDYMS")
+ @JsonFormat(pattern = LocalDateTimeFormatters.FORMAT_YYYYMMDDHHMMSS_14)
+ @DateTimeFormat(pattern = "yyyyMMddHHmmss")
+ private LocalDateTime REGDYMS; // 등록일시
}
diff --git a/src/main/resources/message/LocaleMessage.properties b/src/main/resources/message/LocaleMessage.properties
index 49397e1..5bf34ca 100644
--- a/src/main/resources/message/LocaleMessage.properties
+++ b/src/main/resources/message/LocaleMessage.properties
@@ -2398,6 +2398,7 @@ user.checkRequired2 = Please enter the user name.
user.checkRequired3 = Please enter the password.
user.createBy = Create By
user.createOn = Creation Time
+user.lastLoginYms = Last Login Time
user.depCode = Department Code
user.depart = Department
user.eaiGrupCd = EAI group code
diff --git a/src/main/resources/message/LocaleMessage_en.properties b/src/main/resources/message/LocaleMessage_en.properties
index 10d384c..15d2fe5 100644
--- a/src/main/resources/message/LocaleMessage_en.properties
+++ b/src/main/resources/message/LocaleMessage_en.properties
@@ -2560,6 +2560,7 @@ user.checkRequired2 = Please enter the user name.
user.checkRequired3 = Please enter the password.
user.createBy = Create By
user.createOn = Creation Time
+user.lastLoginYms = Last Login Time
user.depCode = Department Code
user.depart = Department
user.eaiGrupCd = EAI group code
diff --git a/src/main/resources/message/LocaleMessage_ko.properties b/src/main/resources/message/LocaleMessage_ko.properties
index 3db3156..57a5ada 100644
--- a/src/main/resources/message/LocaleMessage_ko.properties
+++ b/src/main/resources/message/LocaleMessage_ko.properties
@@ -2661,6 +2661,7 @@ user.checkRequired4 = \uC811\uC18D \uD5C8\uC6A9 IP\uB97C \uD655\uC778\uD558\u
user.checkRequired5 = \uC0AC\uC6A9\uC790 \uACC4\uC815 \uC0C1\uD0DC\uB97C \uD655\uC778\uD558\uC5EC \uC8FC\uC2ED\uC2DC\uC624..
user.createBy = \uB4F1\uB85D\uC778
user.createOn = \uB4F1\uB85D\uC77C\uC2DC
+user.lastLoginYms = \uCD5C\uC885\uB85C\uADF8\uC778\uC77C\uC2DC
user.depCode = \uBD80\uC810\uCF54\uB4DC
user.depart = \uBD80\uC11C\uBA85
user.eaiGrupCd = EAI\uADF8\uB8F9\uD68C\uC0AC\uCF54\uB4DC