From aad78df34bc35344842374de83791cf0b4623cb4 Mon Sep 17 00:00:00 2001 From: green <2624612302@qq.com> Date: Thu, 27 Nov 2025 18:37:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/psychology/PsyUserProfile.java | 25 ++++++++++--------- .../src/views/psychology/profile/index.vue | 21 ++++++++++++++++ 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/ry-xinli-system/src/main/java/com/ddnai/system/domain/psychology/PsyUserProfile.java b/ry-xinli-system/src/main/java/com/ddnai/system/domain/psychology/PsyUserProfile.java index 6e05ae4f..c003eb0c 100644 --- a/ry-xinli-system/src/main/java/com/ddnai/system/domain/psychology/PsyUserProfile.java +++ b/ry-xinli-system/src/main/java/com/ddnai/system/domain/psychology/PsyUserProfile.java @@ -34,7 +34,7 @@ public class PsyUserProfile extends BaseEntity private String profileData; /** 姓名 */ - @Excel(name = "罪犯姓名", sort = 2) + @Excel(name = "罪犯姓名（必填）", sort = 2) private String userName; /** 电话 */ @@ -42,14 +42,15 @@ public class PsyUserProfile extends BaseEntity /** 生日 */ @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "出生日期", sort = 6, width = 20, dateFormat = "yyyy-MM-dd") private java.util.Date birthday; /** 监狱 */ - @Excel(name = "监狱", sort = 3) + @Excel(name = "监狱（必填）", sort = 3) private String prison; /** 监区 */ - @Excel(name = "监区", sort = 4) + @Excel(name = "监区（必填）", sort = 4) private String prisonArea; /** 性别 */ @@ -57,38 +58,38 @@ public class PsyUserProfile extends BaseEntity private String gender; /** 民族 */ - @Excel(name = "民族", sort = 6) + @Excel(name = "民族", sort = 7) private String nation; /** 文化程度 */ - @Excel(name = "文化程度", sort = 7) + @Excel(name = "文化程度", sort = 8) private String educationLevel; /** 罪名 */ - @Excel(name = "罪名", sort = 8) + @Excel(name = "罪名", sort = 9) private String crimeName; /** 刑期 */ - @Excel(name = "刑期", sort = 9) + @Excel(name = "刑期", sort = 10) private String sentenceTerm; /** 刑期起日 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "刑期起日", sort = 10, width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "刑期起日", sort = 11, width = 30, dateFormat = "yyyy-MM-dd") private java.util.Date sentenceStartDate; /** 刑期止日 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "刑期止日", sort = 11, width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "刑期止日", sort = 12, width = 30, dateFormat = "yyyy-MM-dd") private java.util.Date sentenceEndDate; /** 入监时间 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "入监时间", sort = 12, width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "入监时间", sort = 13, width = 30, dateFormat = "yyyy-MM-dd") private java.util.Date entryDate; /** 用户状态（0在押 1释放 2外出 3假释） */ - @Excel(name = "状态", sort = 13, readConverterExp = "0=在押,1=释放,2=外出,3=假释") + @Excel(name = "状态", sort = 14, readConverterExp = "0=在押,1=释放,2=外出,3=假释") private String status; /** 部门ID */ @@ -98,7 +99,7 @@ public class PsyUserProfile extends BaseEntity private String deptName; /** 信息编号 */ - @Excel(name = "信息编号", sort = 1) + @Excel(name = "信息编号（必填）", sort = 1) private String infoNumber; public Long getProfileId() diff --git a/xinli-ui/src/views/psychology/profile/index.vue b/xinli-ui/src/views/psychology/profile/index.vue index 1e7d261c..cebd4068 100644 --- a/xinli-ui/src/views/psychology/profile/index.vue +++ b/xinli-ui/src/views/psychology/profile/index.vue @@ -114,6 +114,11 @@ {{ scope.row.gender || '-' }} + + +