优化项目导入用户模板日期问题

ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java

@@ -1,18 +1,18 @@
 package com.ruoyi.generator.mapper;
 
 import java.util.List;
+
 import com.ruoyi.generator.domain.GenTable;
 
 /**
  * 业务 数据层
- * 
+ *
  * @author ruoyi
  */
-public interface GenTableMapper
-{
+public interface GenTableMapper {
     /**
      * 查询业务列表
-     * 
+     *
      * @param genTable 业务信息
      * @return 业务集合
      */
@@ -20,7 +20,7 @@ public interface GenTableMapper
 
     /**
      * 查询据库列表
-     * 
+     *
      * @param genTable 业务信息
      * @return 数据库表集合
      */
@@ -28,7 +28,7 @@ public interface GenTableMapper
 
     /**
      * 查询据库列表
-     * 
+     *
      * @param tableNames 表名称组
      * @return 数据库表集合
      */
@@ -36,14 +36,14 @@ public interface GenTableMapper
 
     /**
      * 查询所有表信息
-     * 
+     *
      * @return 表信息集合
      */
     public List<GenTable> selectGenTableAll();
 
     /**
      * 查询表ID业务信息
-     * 
+     *
      * @param id 业务ID
      * @return 业务信息
      */
@@ -51,7 +51,7 @@ public interface GenTableMapper
 
     /**
      * 查询表名称业务信息
-     * 
+     *
      * @param tableName 表名称
      * @return 业务信息
      */
@@ -59,7 +59,7 @@ public interface GenTableMapper
 
     /**
      * 新增业务
-     * 
+     *
      * @param genTable 业务信息
      * @return 结果
      */
@@ -67,7 +67,7 @@ public interface GenTableMapper
 
     /**
      * 修改业务
-     * 
+     *
      * @param genTable 业务信息
      * @return 结果
      */
@@ -75,7 +75,7 @@ public interface GenTableMapper
 
     /**
      * 批量删除业务
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

ruoyi-system/src/main/java/com/ruoyi/system/domain/TUserProfile.java

@@ -1,7 +1,9 @@
 package com.ruoyi.system.domain;
 
+import java.util.Date;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -30,7 +32,7 @@ public class TUserProfile extends BaseEntity {
     /**
      * 性别
      */
-    @Excel(name = "性别")
+    @Excel(name = "性别", comboDictType = "sys_user_sex")
     private Integer gender;
 
     /**
@@ -60,8 +62,9 @@ public class TUserProfile extends BaseEntity {
     /**
      * 出生年月
      */
-    @Excel(name = "出生年月")
-    private String birthday;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出生年月", dateFormat = "yyyy-MM-dd")
+    private Date birthday;
 
     /**
      * 年龄
@@ -72,7 +75,7 @@ public class TUserProfile extends BaseEntity {
     /**
      * 结婚状态
      */
-    @Excel(name = "结婚状态")
+    @Excel(name = "结婚状态", comboDictType = "sys_marry_status")
     private Integer marrStatus;
 
     /**
@@ -90,13 +93,13 @@ public class TUserProfile extends BaseEntity {
     /**
      * 客户类别
      */
-    @Excel(name = "客户类别")
+    @Excel(name = "客户类别", comboDictType = "sys_user_type")
     private Integer clientType;
 
     /**
      * 居住情况
      */
-    @Excel(name = "居住情况")
+    @Excel(name = "居住情况", comboDictType = "sys_live_status")
     private Integer liveStatus;
 
     /**
@@ -162,19 +165,19 @@ public class TUserProfile extends BaseEntity {
     /**
      * 服务状态
      */
-    @Excel(name = "服务状态")
+    @Excel(name = "服务状态", comboDictType = "sys_service_type")
     private Integer serviceType;
 
     /**
      * 医疗保障
      */
-    @Excel(name = "医疗保障")
+    @Excel(name = "医疗保障", comboDictType = "sys_treate_sure")
     private Integer treateSure;
 
     /**
      * 经济来源
      */
-    @Excel(name = "经济来源")
+    @Excel(name = "经济来源", comboDictType = "sys_money_come")
     private Integer moneyCome;
 
     /**
@@ -192,37 +195,37 @@ public class TUserProfile extends BaseEntity {
     /**
      * 慢性疾病
      */
-    @Excel(name = "慢性疾病")
+    @Excel(name = "慢性疾病", comboDictType = "sys_slow_illness")
     private String slowIllness;
 
     /**
      * 血型
      */
-    @Excel(name = "血型")
+    @Excel(name = "血型", comboDictType = "sys_blood_type")
     private Integer bloodType;
 
     /**
      * 失能状态
      */
-    @Excel(name = "失能状态")
+    @Excel(name = "失能状态", comboDictType = "sys_shi_status")
     private Integer shiStatus;
 
     /**
      * 残疾情况
      */
-    @Excel(name = "残疾情况")
+    @Excel(name = "残疾情况", comboDictType = "sys_disablity_status")
     private Integer disablityStatus;
 
     /**
      * 残疾登记
      */
-    @Excel(name = "残疾登记")
+    @Excel(name = "残疾登记", comboDictType = "sys_disablity_entry")
     private Integer disablityEntry;
 
     /**
      * 文化程度
      */
-    @Excel(name = "文化程度")
+    @Excel(name = "文化程度", comboDictType = "sys_educa_level")
     private Integer educaLevel;
 
     /**
@@ -258,13 +261,13 @@ public class TUserProfile extends BaseEntity {
     /**
      * 特长
      */
-    @Excel(name = "特长")
+    @Excel(name = "特长", comboDictType = "sys_speciality")
     private String speciality;
 
     /**
      * 爱好
      */
-    @Excel(name = "爱好")
+    @Excel(name = "爱好", comboDictType = "sys_hobby")
     private String hobby;
 
     /**
@@ -346,11 +349,11 @@ public class TUserProfile extends BaseEntity {
         return telThree;
     }
 
-    public void setBirthday(String birthday) {
+    public void setBirthday(Date birthday) {
         this.birthday = birthday;
     }
 
-    public String getBirthday() {
+    public Date getBirthday() {
         return birthday;
     }