diff --git a/admin/src/views/user/detail.vue b/admin/src/views/user/detail.vue index 6f68497..3a4f924 100644 --- a/admin/src/views/user/detail.vue +++ b/admin/src/views/user/detail.vue @@ -454,6 +454,36 @@ onMounted(() => { + + + {{ userDetail.profile.isLivingAlone ? '是' : '否' }} + + + {{ userDetail.profile.parentStatus || '-' }} + + + {{ userDetail.profile.parentRetireStatus || '-' }} + + + {{ userDetail.profile.parentProvince || '' }}{{ userDetail.profile.parentCity || '-' }} + + + {{ userDetail.profile.parentHousingStatus || '-' }} + + + {{ userDetail.profile.parentPensionStatus || '-' }} + + + {{ userDetail.profile.parentMedicalStatus || '-' }} + + + + + {{ userDetail.parentStatus || '未填写' }} - 是否退休 - {{ userDetail.isParentRetired ? '已退休' : '未退休' }} + 退休情况 + {{ userDetail.parentRetireStatus || '未填写' }} 父母现居 {{ userDetail.parentCity || '未填写' }} - 是否有房 - {{ userDetail.parentHasHouse ? '有' : '无' }} + 住房情况 + {{ userDetail.parentHousingStatus || '未填写' }} + + + 养老保险 + {{ userDetail.parentPensionStatus || '未填写' }} + + + 医疗保险 + {{ userDetail.parentMedicalStatus || '未填写' }} diff --git a/miniapp/pages/profile/edit.vue b/miniapp/pages/profile/edit.vue index 8ca3bcf..42e0772 100644 --- a/miniapp/pages/profile/edit.vue +++ b/miniapp/pages/profile/edit.vue @@ -545,9 +545,9 @@ - + - 父母情况 + 父母基本情况 - + - 父母是否退休 - - - 已退休 + 父母退休情况 + + + {{ formData.parentRetireStatus || '请选择' }} + ▼ - - 未退休 - - + - + - 父母现居城市 + 父母居住城市 - + - 父母是否有房 - - - 有 + 父母住房情况 + + + {{ formData.parentHousingStatus || '请选择' }} + ▼ - - 无 + + + + + + 父母养老保险 + + + {{ formData.parentPensionStatus || '请选择' }} + ▼ - + + + + + + 父母医疗保险 + + + {{ formData.parentMedicalStatus || '请选择' }} + ▼ + + @@ -767,11 +789,13 @@ const formData = reactive({ phone: '', // 验证后的手机号 // 父母情况 isLivingAlone: false, // 是否独居 - parentStatus: '', // 父母情况 - isParentRetired: false, // 父母是否退休 + parentStatus: '双亲健在', // 父母基本情况 + parentRetireStatus: '', // 父母退休情况 parentProvince: '', // 父母现居省 parentCity: '', // 父母现居市 - parentHasHouse: false, // 父母是否有房 + parentHousingStatus: '', // 父母住房情况 + parentPensionStatus: '', // 父母养老保险 + parentMedicalStatus: '', // 父母医疗保险 requirement: { ageMin: 0, ageMax: 0, @@ -841,13 +865,42 @@ const expectMarryOptions = [ { value: 3, label: '孩子满意就结婚' } ] -// 父母情况选项 +// 父母基本情况选项 const parentStatusOptions = [ - { value: '父母健在', label: '父母健在' }, + { value: '双亲健在', label: '双亲健在' }, { value: '父亲去世', label: '父亲去世' }, { value: '母亲去世', label: '母亲去世' }, - { value: '父母均已去世', label: '父母均已去世' }, - { value: '父母离异', label: '父母离异' } + { value: '双亲去世', label: '双亲去世' } +] + +// 父母退休情况选项 +const parentRetireOptions = [ + { value: '双亲退休', label: '双亲退休' }, + { value: '父亲退休', label: '父亲退休' }, + { value: '母亲退休', label: '母亲退休' }, + { value: '双亲未退休', label: '双亲未退休' } +] + +// 父母住房情况选项 +const parentHousingOptions = [ + { value: '与孩子同住', label: '与孩子同住' }, + { value: '居住地有房且不与孩子同住', label: '居住地有房且不与孩子同住' } +] + +// 父母养老保险选项 +const parentPensionOptions = [ + { value: '双亲都有', label: '双亲都有' }, + { value: '父亲有', label: '父亲有' }, + { value: '母亲有', label: '母亲有' }, + { value: '双亲都没有', label: '双亲都没有' } +] + +// 父母医疗保险选项 +const parentMedicalOptions = [ + { value: '双亲都有', label: '双亲都有' }, + { value: '父亲有', label: '父亲有' }, + { value: '母亲有', label: '母亲有' }, + { value: '双亲都没有', label: '双亲都没有' } ] // 出生年份选项 (Property 9: Birth Year Range) @@ -1136,6 +1189,11 @@ const handleParentStatusChange = (e) => { formData.parentStatus = parentStatusOptions[e.detail.value].value } +// 父母退休情况选择 +const handleParentRetireChange = (e) => { + formData.parentRetireStatus = parentRetireOptions[e.detail.value].value +} + // 父母现居城市选择 const handleParentCityChange = (e) => { const [province, city] = e.detail.value @@ -1143,6 +1201,21 @@ const handleParentCityChange = (e) => { formData.parentCity = city } +// 父母住房情况选择 +const handleParentHousingChange = (e) => { + formData.parentHousingStatus = parentHousingOptions[e.detail.value].value +} + +// 父母养老保险选择 +const handleParentPensionChange = (e) => { + formData.parentPensionStatus = parentPensionOptions[e.detail.value].value +} + +// 父母医疗保险选择 +const handleParentMedicalChange = (e) => { + formData.parentMedicalStatus = parentMedicalOptions[e.detail.value].value +} + // 多选切换 const toggleEducationRequirement = (value) => { const idx = formData.requirement.education.indexOf(value) diff --git a/server/src/XiangYi.Application/DTOs/Requests/ProfileRequests.cs b/server/src/XiangYi.Application/DTOs/Requests/ProfileRequests.cs index 7a360be..fbaff07 100644 --- a/server/src/XiangYi.Application/DTOs/Requests/ProfileRequests.cs +++ b/server/src/XiangYi.Application/DTOs/Requests/ProfileRequests.cs @@ -121,14 +121,14 @@ public class ProfileRequest public bool IsLivingAlone { get; set; } /// - /// 父母情况 + /// 父母基本情况 /// public string? ParentStatus { get; set; } /// - /// 父母是否退休 + /// 父母退休情况 /// - public bool IsParentRetired { get; set; } + public string? ParentRetireStatus { get; set; } /// /// 父母现居省份 @@ -141,9 +141,19 @@ public class ProfileRequest public string? ParentCity { get; set; } /// - /// 父母是否有房 + /// 父母住房情况 /// - public bool ParentHasHouse { get; set; } + public string? ParentHousingStatus { get; set; } + + /// + /// 父母养老保险 + /// + public string? ParentPensionStatus { get; set; } + + /// + /// 父母医疗保险 + /// + public string? ParentMedicalStatus { get; set; } /// /// 择偶要求 diff --git a/server/src/XiangYi.Application/DTOs/Responses/AdminUserResponses.cs b/server/src/XiangYi.Application/DTOs/Responses/AdminUserResponses.cs index cf3991c..ec3517b 100644 --- a/server/src/XiangYi.Application/DTOs/Responses/AdminUserResponses.cs +++ b/server/src/XiangYi.Application/DTOs/Responses/AdminUserResponses.cs @@ -422,6 +422,46 @@ public class AdminUserProfileDto /// 更新时间 /// public DateTime? UpdateTime { get; set; } + + /// + /// 是否独居 + /// + public bool IsLivingAlone { get; set; } + + /// + /// 父母基本情况 + /// + public string? ParentStatus { get; set; } + + /// + /// 父母退休情况 + /// + public string? ParentRetireStatus { get; set; } + + /// + /// 父母居住省份 + /// + public string? ParentProvince { get; set; } + + /// + /// 父母居住城市 + /// + public string? ParentCity { get; set; } + + /// + /// 父母住房情况 + /// + public string? ParentHousingStatus { get; set; } + + /// + /// 父母养老保险 + /// + public string? ParentPensionStatus { get; set; } + + /// + /// 父母医疗保险 + /// + public string? ParentMedicalStatus { get; set; } } diff --git a/server/src/XiangYi.Application/DTOs/Responses/ProfileResponses.cs b/server/src/XiangYi.Application/DTOs/Responses/ProfileResponses.cs index 91bac99..0f2f0d7 100644 --- a/server/src/XiangYi.Application/DTOs/Responses/ProfileResponses.cs +++ b/server/src/XiangYi.Application/DTOs/Responses/ProfileResponses.cs @@ -191,14 +191,14 @@ public class ProfileResponse public bool IsLivingAlone { get; set; } /// - /// 父母状况 + /// 父母基本情况 /// public string? ParentStatus { get; set; } /// - /// 父母是否退休 + /// 父母退休情况 /// - public bool IsParentRetired { get; set; } + public string? ParentRetireStatus { get; set; } /// /// 父母现居省份 @@ -211,9 +211,19 @@ public class ProfileResponse public string? ParentCity { get; set; } /// - /// 父母是否有房 + /// 父母住房情况 /// - public bool ParentHasHouse { get; set; } + public string? ParentHousingStatus { get; set; } + + /// + /// 父母养老保险 + /// + public string? ParentPensionStatus { get; set; } + + /// + /// 父母医疗保险 + /// + public string? ParentMedicalStatus { get; set; } } /// diff --git a/server/src/XiangYi.Application/Services/AdminUserService.cs b/server/src/XiangYi.Application/Services/AdminUserService.cs index 5b79a70..6d49c45 100644 --- a/server/src/XiangYi.Application/Services/AdminUserService.cs +++ b/server/src/XiangYi.Application/Services/AdminUserService.cs @@ -615,7 +615,16 @@ public class AdminUserService : IAdminUserService AuditTime = profile.AuditTime, RejectReason = profile.RejectReason, CreateTime = profile.CreateTime, - UpdateTime = profile.UpdateTime + UpdateTime = profile.UpdateTime, + // 父母情况 + IsLivingAlone = profile.IsLivingAlone, + ParentStatus = profile.ParentStatus, + ParentRetireStatus = profile.ParentRetireStatus, + ParentProvince = profile.ParentProvince, + ParentCity = profile.ParentCity, + ParentHousingStatus = profile.ParentHousingStatus, + ParentPensionStatus = profile.ParentPensionStatus, + ParentMedicalStatus = profile.ParentMedicalStatus }; } diff --git a/server/src/XiangYi.Application/Services/ProfileService.cs b/server/src/XiangYi.Application/Services/ProfileService.cs index 33dde84..e7c4d94 100644 --- a/server/src/XiangYi.Application/Services/ProfileService.cs +++ b/server/src/XiangYi.Application/Services/ProfileService.cs @@ -98,10 +98,12 @@ public class ProfileService : IProfileService // 父母情况 IsLivingAlone = request.IsLivingAlone, ParentStatus = request.ParentStatus, - IsParentRetired = request.IsParentRetired, + ParentRetireStatus = request.ParentRetireStatus, ParentProvince = request.ParentProvince, ParentCity = request.ParentCity, - ParentHasHouse = request.ParentHasHouse, + ParentHousingStatus = request.ParentHousingStatus, + ParentPensionStatus = request.ParentPensionStatus, + ParentMedicalStatus = request.ParentMedicalStatus, AuditStatus = (int)AuditStatus.Pending, // 新资料设为待审核 CreateTime = DateTime.Now, UpdateTime = DateTime.Now @@ -139,10 +141,12 @@ public class ProfileService : IProfileService // 父母情况 existingProfile.IsLivingAlone = request.IsLivingAlone; existingProfile.ParentStatus = request.ParentStatus; - existingProfile.IsParentRetired = request.IsParentRetired; + existingProfile.ParentRetireStatus = request.ParentRetireStatus; existingProfile.ParentProvince = request.ParentProvince; existingProfile.ParentCity = request.ParentCity; - existingProfile.ParentHasHouse = request.ParentHasHouse; + existingProfile.ParentHousingStatus = request.ParentHousingStatus; + existingProfile.ParentPensionStatus = request.ParentPensionStatus; + existingProfile.ParentMedicalStatus = request.ParentMedicalStatus; existingProfile.AuditStatus = (int)AuditStatus.Pending; // 更新资料重置为待审核 existingProfile.RejectReason = null; // 清除之前的拒绝原因 existingProfile.UpdateTime = DateTime.Now; @@ -255,10 +259,12 @@ public class ProfileService : IProfileService // 父母情况 IsLivingAlone = profile.IsLivingAlone, ParentStatus = profile.ParentStatus, - IsParentRetired = profile.IsParentRetired, + ParentRetireStatus = profile.ParentRetireStatus, ParentProvince = profile.ParentProvince, ParentCity = profile.ParentCity, - ParentHasHouse = profile.ParentHasHouse, + ParentHousingStatus = profile.ParentHousingStatus, + ParentPensionStatus = profile.ParentPensionStatus, + ParentMedicalStatus = profile.ParentMedicalStatus, IsMember = user.IsMember, IsRealName = user.IsRealName, Photos = photos.OrderBy(p => p.Sort).Select(p => new PhotoResponse diff --git a/server/src/XiangYi.Core/Entities/Biz/UserProfile.cs b/server/src/XiangYi.Core/Entities/Biz/UserProfile.cs index 5e1e081..68dc6cd 100644 --- a/server/src/XiangYi.Core/Entities/Biz/UserProfile.cs +++ b/server/src/XiangYi.Core/Entities/Biz/UserProfile.cs @@ -154,15 +154,16 @@ public class UserProfile : BaseEntity public bool IsLivingAlone { get; set; } /// - /// 父母情况 + /// 父母基本情况 /// [Column(StringLength = 50)] public string? ParentStatus { get; set; } /// - /// 父母是否退休 + /// 父母退休情况 /// - public bool IsParentRetired { get; set; } + [Column(StringLength = 50)] + public string? ParentRetireStatus { get; set; } /// /// 父母现居省份 @@ -177,9 +178,22 @@ public class UserProfile : BaseEntity public string? ParentCity { get; set; } /// - /// 父母是否有房 + /// 父母住房情况 /// - public bool ParentHasHouse { get; set; } + [Column(StringLength = 50)] + public string? ParentHousingStatus { get; set; } + + /// + /// 父母养老保险 + /// + [Column(StringLength = 50)] + public string? ParentPensionStatus { get; set; } + + /// + /// 父母医疗保险 + /// + [Column(StringLength = 50)] + public string? ParentMedicalStatus { get; set; } #region 导航属性