marry status

src/main/java/cn/quantgroup/xyqb/entity/UserExtInfo.java

 package cn.quantgroup.xyqb.entity;
 
-import cn.quantgroup.xyqb.entity.enumerate.EducationEnum;
-import cn.quantgroup.xyqb.entity.enumerate.IncomeEnum;
-import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum;
-import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
+import cn.quantgroup.xyqb.entity.enumerate.*;
 import lombok.Data;
 
 import javax.persistence.Column;
@@ -44,7 +41,7 @@ public class UserExtInfo implements Serializable {
     @Column(name = "has_credit_card")
     private boolean hasCreditCard;
     @Column(name = "marry_status")
-    private boolean marryStatus;
+    private MaritalStatus marryStatus;
     @Column(name = "created_at")
     private Timestamp createdAt;
     @Column(name = "updated_at")

src/main/java/cn/quantgroup/xyqb/entity/enumerate/MaritalStatus.java

+package cn.quantgroup.xyqb.entity.enumerate;
+
+/**
+ * Created by sunnan on 2016-11-24.
+ */
+public enum MaritalStatus {
+
+    UNKNOWN("未知"),
+    SINGLE("未婚"), // 1
+    MARRIED("已婚"), // 2
+    DIVORCED("离异"), // 3
+    WINDOWED("丧偶"), // 4
+    OTHER("其他");
+
+
+    String description;
+
+    MaritalStatus(String desc) {
+        description = desc;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuffer sb = new StringBuffer("MaritalStatus{");
+        sb.append("description='").append(description).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
+}

src/main/java/cn/quantgroup/xyqb/model/UserExtInfoRet.java

 package cn.quantgroup.xyqb.model;
 
 import cn.quantgroup.xyqb.entity.UserExtInfo;
-import cn.quantgroup.xyqb.entity.enumerate.EducationEnum;
-import cn.quantgroup.xyqb.entity.enumerate.IncomeEnum;
-import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum;
-import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
+import cn.quantgroup.xyqb.entity.enumerate.*;
 import lombok.Data;
 
 import java.sql.Timestamp;
@@ -26,7 +23,7 @@ public class UserExtInfoRet {
     private boolean hasSocialSecurity;
     private boolean hasHouse;
     private boolean hasCreditCard;
-    private boolean marryStatus;
+    private MaritalStatus marryStatus;
     private Long createdAt;
     private Long updateAt;
 
@@ -45,7 +42,7 @@ public class UserExtInfoRet {
         ret.setHasSocialSecurity(extInfo.isHasSocialSecurity());
         ret.setHasHouse(extInfo.isHasHouse());
         ret.setHasCreditCard(extInfo.isHasCreditCard());
-        ret.setMarryStatus(extInfo.isMarryStatus());
+        ret.setMarryStatus(extInfo.getMarryStatus());
         ret.setCreatedAt(extInfo.getCreatedAt().getTime());
         ret.setUpdateAt(extInfo.getUpdateAt().getTime());
         return ret;