guo00guo 5 년 전
부모
커밋
6710081f33

+ 2 - 2
core/src/main/java/com/mooctest/crowd/domain/model/QualificationPO.java

@@ -3,7 +3,7 @@ package com.mooctest.crowd.domain.model;
 import lombok.Data;
 
 import javax.persistence.*;
-import java.sql.Timestamp;
+import java.sql.Date;
 
 
 @Data
@@ -26,7 +26,7 @@ public class QualificationPO {
     private String  LicensingAuthority;
 
     @Column(name="Q_TIME")
-    private Timestamp time;
+    private Date time;
 
     @Column(name="Q_U_ID")
     private Long userId;

+ 3 - 5
core/src/main/java/com/mooctest/crowd/domain/model/UserPO.java

@@ -2,10 +2,8 @@ package com.mooctest.crowd.domain.model;
 
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
+import java.sql.Date;
 import java.sql.Timestamp;
 
 /**
@@ -59,7 +57,7 @@ public class UserPO {
     private Timestamp createTime;
 
     @Column(name="U_BIRTHDAY")
-    private Timestamp birthday;
+    private Date birthday;
 
     @Column(name="U_PERSONAL_COMPETENCE")
     private String personalCompetence;

+ 2 - 3
site/src/main/java/com/mooctest/crowd/site/data/vo/QualificationVO.java

@@ -2,8 +2,7 @@ package com.mooctest.crowd.site.data.vo;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
-import java.sql.Timestamp;
+import java.sql.Date;
 
 @Data
 @NoArgsConstructor
@@ -13,7 +12,7 @@ public class QualificationVO{
     private String name;
     private String  number;
     private String  licensingAuthority;
-    private Timestamp time;
+    private Date time;
     private Long userId;
     private int isPublic;
 }

+ 2 - 2
site/src/main/java/com/mooctest/crowd/site/data/vo/UserVO.java

@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
-import java.sql.Timestamp;
+import java.sql.Date;
 import java.util.List;
 
 /**
@@ -33,7 +33,7 @@ public class UserVO implements Serializable {
     private Double allProjectPrice;
     private String authType;
     private Long taskCount;
-    private Timestamp birthday;
+    private Date birthday;
     private List<String> personalCompetence;
     private String unit;
     private String county;

+ 3 - 1
site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -1104,7 +1104,9 @@ public class WebMediatorImpl implements ViewMediator {
         userPO.get().setBirthday(userVO.getBirthday());
         userPO.get().setProvince(userVO.getProvince());
         userPO.get().setCity(userVO.getCity());
-        userPO.get().setCounty(userVO.getCounty());
+        if(userVO.getCounty()!=null){
+            userPO.get().setCounty(userVO.getCounty());
+        }
         userPO.get().setPersonalCompetence(JSONObject.toJSONString(userVO.getPersonalCompetence()));
         userDao.save(userPO.get());
         return this.getInformation(userId);