ws-第一次

Author: 1021862752

pom.xml

@@ -21,7 +21,7 @@
     </repositories>
     <packaging>jar</packaging>
 
-    <name>EnjoyMeal</name>
+    <name>PerformanceAppraisal</name>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -249,6 +249,6 @@
     </build>
 
 
-    <artifactId>EnjoyMeal</artifactId>
+    <artifactId>PerformanceAppraisal</artifactId>
     <description></description>
 </project>

src/main/java/cn/edu/fjnu/towide/dao/GroupDao.java

@@ -2,15 +2,14 @@
 
 import java.util.List;
 
+import cn.edu.fjnu.towide.entity.Group;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Repository;
 
-import cn.edu.fjnu.towide.entity.Group;
-
 @Repository
 public interface GroupDao {
 

src/main/java/cn/edu/fjnu/towide/entity/KeyVerificationCode.java

@@ -7,10 +7,10 @@
 
 @Data
 public class KeyVerificationCode {
-    private String keyWord;
+  private String keyWord;
 
-    private String verificationCode;
+  private String verificationCode;
 
-    private Date generateTime;
+  private Date generateTime;
 
 }

src/main/java/cn/edu/fjnu/towide/entity/OperationLog.java

@@ -9,27 +9,27 @@
 @Data
 public class OperationLog {
 
-    private String username;
+  private String username;
 
-    private String ip;
+  private String ip;
 
-    private String examinee;
+  private String examinee;
 
-    private String operationContent;
+  private String operationContent;
 
-    @JsonIgnore
-    private Date operationDateTime;
+  @JsonIgnore
+  private Date operationDateTime;
 
-	private String operationDateTimeString;
+  private String operationDateTimeString;
 
-    private String operationResult;
+  private String operationResult;
 
-    private String reason;
+  private String reason;
 
-    
-    public String getOperationDateTimeString() {
-    	return DateTimeUtil.getDateTimeString(getOperationDateTime());
-	}
+
+  public String getOperationDateTimeString() {
+    return DateTimeUtil.getDateTimeString(getOperationDateTime());
+  }
 
 
 

src/main/java/cn/edu/fjnu/towide/entity/UserDetails.java

@@ -1,6 +1,7 @@
 package cn.edu.fjnu.towide.entity;
 
-
+import cn.edu.fjnu.towide.entity.Authority;
+import cn.edu.fjnu.towide.entity.Group;
 import cn.edu.fjnu.towide.util.DateTimeUtil;
 import lombok.Data;
 
@@ -11,44 +12,60 @@
 @Data
 public class UserDetails {
 
-  private String username;//微信openId
-  private String realName;
-  private String idCardNum;
-  private String email;
-  private String phone;
-  private String sex;
-  private Date birthday;
-  private String birthdayString;
-  private String checkSum;
-  private Date createTime;
-  private String createTimeString;
-  private Date updateTime;
-  private String updateTimeString;
-  private String checkState;
-  private Integer enrolState;
-  private String head; //头像
-  private String province; //省份
-  private String city; //城市
-  private String nickname; //昵称
-
-  private Integer enabled;
-  private Set<Authority> authorities;
-  private List<Group> groups;
-  private String schoolCode;  //院校编码
-  public void setCreateTime(Date createTime) {
-    this.createTime = createTime;
-    this.createTimeString= DateTimeUtil.getDateTimeString(createTime);
-  }
-
-  public void setBirthday(Date birthday) {
-    this.birthday = birthday;
-    this.birthdayString=DateTimeUtil.getDateTimeString(birthday);
-  }
-
-  public void setUpdateTime(Date updateTime) {
-    this.updateTime = updateTime;
-    this.updateTimeString=DateTimeUtil.getDateTimeString(updateTime);
-  }
+    private String username;
+    private String realName;
+    //  private String question;
+//  private String answer;
+    private String idCardNum;
+    private String email;
+    private String phone;
+    private String sex;
+    private Date birthday;
+    private String birthdayString;
+    private String checkSum;
+    private Date createTime;
+    private String createTimeString;
+    private Date updateTime;
+    private String updateTimeString;
+    private String checkState;
+    private Integer enrolState;
+    private Date lastSubmitTime;
+    private String lastSubmitTimeString;
+    private Date lastCheckTime;
+    private String lastCheckTimeString;
+
+    private String remarks; //备注
+    private String deptId;  //部门
+    private double baseSalary; //底薪
+    private String code;//编号
+    private String idCard;//身份证
+
+    private Integer enabled;
+    private Set<Authority> authorities;
+    private List<Group> groups;
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        this.createTimeString= DateTimeUtil.getDateTimeString(createTime);
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+        this.birthdayString=DateTimeUtil.getDateTimeString(birthday);
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        this.updateTimeString=DateTimeUtil.getDateTimeString(updateTime);
+    }
 
+    public void setLastSubmitTime(Date lastSubmitTime) {
+        this.lastSubmitTime = lastSubmitTime;
+        this.lastSubmitTimeString=DateTimeUtil.getDateTimeString(lastSubmitTime);
+    }
 
+    public void setLastCheckTime(Date lastCheckTime) {
+        this.lastCheckTime = lastCheckTime;
+        this.lastCheckTimeString=DateTimeUtil.getDateTimeString(lastCheckTime);
+    }
 }

src/main/java/cn/edu/fjnu/towide/ww/usercenter/service/UserCenterBusinessService.java

@@ -248,10 +248,7 @@ public void getUserRegistrationRequestProcess() {
         //将注册的用户信息写到数据库中
         UserDetails userDetails = new UserDetails();
         userDetails.setUsername(userInfoVo.getUsername());
-        userDetails.setNickname(userInfoVo.getNickname());
-        userDetails.setHead(userInfoVo.getHead());
-        userDetails.setProvince(userInfoVo.getProvince());
-        userDetails.setCity(userInfoVo.getCity());
+
 
         userDetails.setCreateTime(new Date());
         userDetails.setUpdateTime(new Date());