潘钊 / bsth_control · Commits

Commit 8a92a0920de81fec7efb5a829fa200f536f0ad03

Authored by 王通
1 parent 6f9b560e
build: skipped

1.

Inline Side-by-side
Showing 2 changed files with 7 additions and 2 deletions
src/main/java/com/bsth/entity/sys/SysUser.java
  View file @8a92a09
@@ -2,6 +2,7 @@ package com.bsth.entity.sys; @@ -2,6 +2,7 @@ package com.bsth.entity.sys;
2 2
3 import com.fasterxml.jackson.annotation.JsonIgnore; 3 import com.fasterxml.jackson.annotation.JsonIgnore;
4 import com.fasterxml.jackson.annotation.JsonIgnoreProperties; 4 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  5 +import org.springframework.format.annotation.DateTimeFormat;
5 import org.springframework.util.StringUtils; 6 import org.springframework.util.StringUtils;
6 import org.joda.time.DateTime; 7 import org.joda.time.DateTime;
7 import javax.persistence.*; 8 import javax.persistence.*;
@@ -37,10 +38,12 @@ public class SysUser implements Serializable { @@ -37,10 +38,12 @@ public class SysUser implements Serializable {
37 38
38 @Column(name = "update_date", columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP") 39 @Column(name = "update_date", columnDefinition = "timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
39 private Date updateDate; 40 private Date updateDate;
40 - 41 +
  42 + @DateTimeFormat(pattern = "yyyy-MM-dd")
41 private Date lastLoginDate; 43 private Date lastLoginDate;
42 44
43 /** 最近密码更新时间 */ 45 /** 最近密码更新时间 */
  46 + @DateTimeFormat(pattern = "yyyy-MM-dd")
44 private Date lastPwdDate; 47 private Date lastPwdDate;
45 /** 密码有效期 */ 48 /** 密码有效期 */
46 private Integer pwdValidPeriod; 49 private Integer pwdValidPeriod;
src/main/resources/static/pages/permission/user/edit.html
  View file @8a92a09
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
31 <input type="hidden" id="id" name="id"> 31 <input type="hidden" id="id" name="id">
32 <input type="hidden" id="jobCode" name="jobCode"> 32 <input type="hidden" id="jobCode" name="jobCode">
33 <input type="hidden" id="realName" name="realName"> 33 <input type="hidden" id="realName" name="realName">
  34 + <input type="hidden" id="lastLoginDate" name="lastLoginDate">
34 <input type="hidden" id="lastPwdDate" name="lastPwdDate"> 35 <input type="hidden" id="lastPwdDate" name="lastPwdDate">
35 <input type="hidden" id="pwdValidPeriod" name="pwdValidPeriod"> 36 <input type="hidden" id="pwdValidPeriod" name="pwdValidPeriod">
36 <input type="text" class="form-control" id="userName" name="userName" readonly="readonly"> 37 <input type="text" class="form-control" id="userName" name="userName" readonly="readonly">
@@ -113,7 +114,8 @@ @@ -113,7 +114,8 @@
113 $("#agencies").attr('value',obj.agencies); 114 $("#agencies").attr('value',obj.agencies);
114 $("#jobCode").attr('value',obj.jobCode); 115 $("#jobCode").attr('value',obj.jobCode);
115 $("#realName").attr('value',obj.realName); 116 $("#realName").attr('value',obj.realName);
116 - $("#lastPwdDate").attr('value',obj.lastPwdDate); 117 + $("#lastLoginDate").attr('value',moment(obj.lastLoginDate).format('YYYY-MM-DD'));
  118 + $("#lastPwdDate").attr('value',moment(obj.lastPwdDate).format('YYYY-MM-DD'));
117 $("#pwdValidPeriod").attr('value',obj.pwdValidPeriod); 119 $("#pwdValidPeriod").attr('value',obj.pwdValidPeriod);
118 /*$get('/role/all',null,function(result){ 120 /*$get('/role/all',null,function(result){
119 $.each(result,function(i,r){ 121 $.each(result,function(i,r){