diff --git a/ZR.Admin.WebApi/Controllers/Liveforum/T_UserCertificationsController.cs b/ZR.Admin.WebApi/Controllers/Liveforum/T_UserCertificationsController.cs index 139efdc..9e51e67 100644 --- a/ZR.Admin.WebApi/Controllers/Liveforum/T_UserCertificationsController.cs +++ b/ZR.Admin.WebApi/Controllers/Liveforum/T_UserCertificationsController.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; using ZR.LiveForum.Model.Liveforum.Dto; using ZR.LiveForum.Model.Liveforum; using ZR.Service.Liveforum.ILiveforumService; @@ -7,13 +7,13 @@ using ZR.Service.Liveforum.ILiveforumService; namespace ZR.Admin.WebApi.Controllers.Liveforum { /// - /// 认证申请表 + /// 认证申请记录 /// [Route("liveforum/tusercertifications")] public class T_UserCertificationsController : BaseController { /// - /// 认证申请表接口 + /// 认证申请记录接口 /// private readonly IT_UserCertificationsService _T_UserCertificationsService; @@ -23,7 +23,7 @@ namespace ZR.Admin.WebApi.Controllers.Liveforum } /// - /// 查询认证申请表列表 + /// 查询认证申请记录列表 /// /// /// @@ -37,7 +37,7 @@ namespace ZR.Admin.WebApi.Controllers.Liveforum /// - /// 查询认证申请表详情 + /// 查询认证申请记录详情 /// /// /// @@ -46,37 +46,37 @@ namespace ZR.Admin.WebApi.Controllers.Liveforum public IActionResult GetT_UserCertifications(long Id) { var response = _T_UserCertificationsService.GetInfo(Id); - + var info = response.Adapt(); return SUCCESS(info); } /// - /// 添加认证申请表 + /// 添加认证申请记录 /// /// [HttpPost] [ActionPermissionFilter(Permission = "tusercertifications:add")] - [Log(Title = "认证申请表", BusinessType = BusinessType.INSERT)] + [Log(Title = "认证申请记录", BusinessType = BusinessType.INSERT)] public IActionResult AddT_UserCertifications([FromBody] T_UserCertificationsDto parm) { var modal = parm.Adapt().ToCreate(HttpContext); - + modal.Status = 0; var response = _T_UserCertificationsService.AddT_UserCertifications(modal); return SUCCESS(response); } /// - /// 更新认证申请表 + /// 更新认证申请记录 /// /// [HttpPut] [ActionPermissionFilter(Permission = "tusercertifications:edit")] - [Log(Title = "认证申请表", BusinessType = BusinessType.UPDATE)] + [Log(Title = "认证申请记录", BusinessType = BusinessType.UPDATE)] public IActionResult UpdateT_UserCertifications([FromBody] T_UserCertificationsDto parm) { - + if (parm.Id == 0) { throw new CustomException(ResultCode.CUSTOM_ERROR, "请求参数为空"); @@ -93,13 +93,13 @@ namespace ZR.Admin.WebApi.Controllers.Liveforum } /// - /// 删除认证申请表 + /// 删除认证申请记录 /// /// [HttpPost("delete/{ids}")] [ActionPermissionFilter(Permission = "tusercertifications:delete")] - [Log(Title = "认证申请表", BusinessType = BusinessType.DELETE)] - public IActionResult DeleteT_UserCertifications([FromRoute]string ids) + [Log(Title = "认证申请记录", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteT_UserCertifications([FromRoute] string ids) { var idArr = Tools.SplitAndConvert(ids); @@ -107,10 +107,10 @@ namespace ZR.Admin.WebApi.Controllers.Liveforum } /// - /// 导出认证申请表 + /// 导出认证申请记录 /// /// - [Log(Title = "认证申请表", BusinessType = BusinessType.EXPORT, IsSaveResponseData = false)] + [Log(Title = "认证申请记录", BusinessType = BusinessType.EXPORT, IsSaveResponseData = false)] [HttpGet("export")] [ActionPermissionFilter(Permission = "tusercertifications:export")] public IActionResult Export([FromQuery] T_UserCertificationsQueryDto parm) @@ -120,7 +120,7 @@ namespace ZR.Admin.WebApi.Controllers.Liveforum { return ToResponse(ResultCode.FAIL, "没有要导出的数据"); } - var result = ExportExcelMini(list, "认证申请表", "认证申请表"); + var result = ExportExcelMini(list, "认证申请记录", "认证申请记录"); return ExportExcel(result.Item2, result.Item1); } diff --git a/ZR.LiveForum.Model/Liveforum/Dto/T_UserCertificationsDto.cs b/ZR.LiveForum.Model/Liveforum/Dto/T_UserCertificationsDto.cs index 4bb0a91..c12efea 100644 --- a/ZR.LiveForum.Model/Liveforum/Dto/T_UserCertificationsDto.cs +++ b/ZR.LiveForum.Model/Liveforum/Dto/T_UserCertificationsDto.cs @@ -2,77 +2,78 @@ namespace ZR.LiveForum.Model.Liveforum.Dto { /// - /// 认证申请表查询对象 + /// 认证申请记录查询对象 /// public class T_UserCertificationsQueryDto : PagerInfo { public long ? UserId { get; set; } public string ? CertificationType { get; set; } + public int ? Status { get; set; } } /// - /// 认证申请表输入输出对象 + /// 认证申请记录输入输出对象 /// public class T_UserCertificationsDto { [Required(ErrorMessage = "Id不能为空")] [ExcelColumn(Name = "Id")] [ExcelColumnName("Id")] - public long Id { get; set; } + public long Id { get; set; } [Required(ErrorMessage = "用户id不能为空")] [ExcelColumn(Name = "用户id")] [ExcelColumnName("用户id")] - public long UserId { get; set; } + public long UserId { get; set; } - [Required(ErrorMessage = "认证类型:1-SK认证不能为空")] - [ExcelColumn(Name = "认证类型:1-SK认证")] - [ExcelColumnName("认证类型:1-SK认证")] - public string CertificationType { get; set; } + [Required(ErrorMessage = "认证类型不能为空")] + [ExcelColumn(Name = "认证类型")] + [ExcelColumnName("认证类型")] + public string CertificationType { get; set; } [ExcelColumn(Name = "用户的抖音账号")] [ExcelColumnName("用户的抖音账号")] - public string DouyinId { get; set; } + public string ? DouyinId { get; set; } [ExcelColumn(Name = "用户联系方式")] [ExcelColumnName("用户联系方式")] - public string ContactInfo { get; set; } + public string ? ContactInfo { get; set; } [ExcelColumn(Name = "认证视频URL地址")] [ExcelColumnName("认证视频URL地址")] - public string VideoUrl { get; set; } + public string ? VideoUrl { get; set; } [ExcelColumn(Name = "粉丝牌等级")] [ExcelColumnName("粉丝牌等级")] - public int? FanLevel { get; set; } + public int ? FanLevel { get; set; } [ExcelColumn(Name = "审核状态")] [ExcelColumnName("审核状态")] - public int? Status { get; set; } + public int ? Status { get; set; } [ExcelColumn(Name = "审核拒绝原因")] [ExcelColumnName("审核拒绝原因")] - public string RejectReason { get; set; } + public string ? RejectReason { get; set; } [ExcelColumn(Name = "审核人用户ID")] [ExcelColumnName("审核人用户ID")] - public long? ReviewerId { get; set; } + public long ? ReviewerId { get; set; } [ExcelColumn(Name = "审核完成时间", Format = "yyyy-MM-dd HH:mm:ss", Width = 20)] [ExcelColumnName("审核完成时间")] - public DateTime? ReviewedAt { get; set; } + public DateTime ? ReviewedAt { get; set; } [ExcelColumn(Name = "认证申请创建时间", Format = "yyyy-MM-dd HH:mm:ss", Width = 20)] [ExcelColumnName("认证申请创建时间")] - public DateTime? CreatedAt { get; set; } + public DateTime ? CreatedAt { get; set; } [ExcelColumn(Name = "记录更新时间", Format = "yyyy-MM-dd HH:mm:ss", Width = 20)] [ExcelColumnName("记录更新时间")] - public DateTime? UpdatedAt { get; set; } + public DateTime ? UpdatedAt { get; set; } - [ExcelColumn(Name = "认证类型:1-SK认证")] + [ExcelColumn(Name = "认证类型")] public string? CertificationTypeLabel { get; set; } [ExcelColumn(Name = "审核状态")] public string? StatusLabel { get; set; } diff --git a/ZR.LiveForum.Model/Liveforum/T_UserCertifications.cs b/ZR.LiveForum.Model/Liveforum/T_UserCertifications.cs index 0299142..649da2c 100644 --- a/ZR.LiveForum.Model/Liveforum/T_UserCertifications.cs +++ b/ZR.LiveForum.Model/Liveforum/T_UserCertifications.cs @@ -1,8 +1,8 @@ - + namespace ZR.LiveForum.Model.Liveforum { /// - /// 认证申请表 + /// 认证申请记录 /// [SugarTable("T_UserCertifications")] [Tenant("liveforum")] @@ -20,24 +20,24 @@ namespace ZR.LiveForum.Model.Liveforum public long UserId { get; set; } /// - /// 认证类型:1-SK认证 + /// 认证类型 /// public string CertificationType { get; set; } /// /// 用户的抖音账号 /// - public string DouyinId { get; set; } + public string? DouyinId { get; set; } /// /// 用户联系方式 /// - public string ContactInfo { get; set; } + public string? ContactInfo { get; set; } /// /// 认证视频URL地址 /// - public string VideoUrl { get; set; } + public string? VideoUrl { get; set; } /// /// 粉丝牌等级 @@ -52,7 +52,7 @@ namespace ZR.LiveForum.Model.Liveforum /// /// 审核拒绝原因 /// - public string RejectReason { get; set; } + public string? RejectReason { get; set; } /// /// 审核人用户ID diff --git a/ZR.Service/Liveforum/ILiveforumService/IT_UserCertificationsService.cs b/ZR.Service/Liveforum/ILiveforumService/IT_UserCertificationsService.cs index 99df20c..95bbf8e 100644 --- a/ZR.Service/Liveforum/ILiveforumService/IT_UserCertificationsService.cs +++ b/ZR.Service/Liveforum/ILiveforumService/IT_UserCertificationsService.cs @@ -4,7 +4,7 @@ using ZR.LiveForum.Model.Liveforum; namespace ZR.Service.Liveforum.ILiveforumService { /// - /// 认证申请表service接口 + /// 认证申请记录service接口 /// public interface IT_UserCertificationsService : IBaseService { diff --git a/ZR.Service/Liveforum/T_UserCertificationsService.cs b/ZR.Service/Liveforum/T_UserCertificationsService.cs index 3cc8c0d..6e10ec5 100644 --- a/ZR.Service/Liveforum/T_UserCertificationsService.cs +++ b/ZR.Service/Liveforum/T_UserCertificationsService.cs @@ -1,4 +1,4 @@ -using Infrastructure.Attribute; +using Infrastructure.Attribute; using Infrastructure.Extensions; using ZR.LiveForum.Model.Liveforum.Dto; using ZR.LiveForum.Model.Liveforum; @@ -8,13 +8,13 @@ using ZR.Service.Liveforum.ILiveforumService; namespace ZR.Service.Liveforum { /// - /// 认证申请表Service业务层处理 + /// 认证申请记录Service业务层处理 /// [AppService(ServiceType = typeof(IT_UserCertificationsService), ServiceLifetime = LifeTime.Transient)] public class T_UserCertificationsService : BaseService, IT_UserCertificationsService { /// - /// 查询认证申请表列表 + /// 查询认证申请记录列表 /// /// /// @@ -46,17 +46,18 @@ namespace ZR.Service.Liveforum } /// - /// 添加认证申请表 + /// 添加认证申请记录 /// /// /// public T_UserCertifications AddT_UserCertifications(T_UserCertifications model) { + return Insertable(model).ExecuteReturnEntity(); } /// - /// 修改认证申请表 + /// 修改认证申请记录 /// /// /// @@ -66,7 +67,7 @@ namespace ZR.Service.Liveforum } /// - /// 导出认证申请表 + /// 导出认证申请记录 /// /// /// @@ -99,6 +100,7 @@ namespace ZR.Service.Liveforum predicate = predicate.AndIF(parm.UserId != null, it => it.UserId == parm.UserId); predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.CertificationType), it => it.CertificationType == parm.CertificationType); + predicate = predicate.AndIF(parm.Status != null, it => it.Status == parm.Status); return predicate; } } diff --git a/ZR.Vue/src/api/liveforum/tusercertifications.js b/ZR.Vue/src/api/liveforum/tusercertifications.js index 57fd8de..dc581ef 100644 --- a/ZR.Vue/src/api/liveforum/tusercertifications.js +++ b/ZR.Vue/src/api/liveforum/tusercertifications.js @@ -2,7 +2,7 @@ import request from '@/utils/request' import { downFile } from '@/utils/request' /** - * 认证申请表分页查询 + * 认证申请记录分页查询 * @param {查询条件} data */ export function listtusercertifications(query) { @@ -14,7 +14,7 @@ export function listtusercertifications(query) { } /** - * 新增认证申请表 + * 新增认证申请记录 * @param data */ export function addtusercertifications(data) { @@ -25,7 +25,7 @@ export function addtusercertifications(data) { }) } /** - * 修改认证申请表 + * 修改认证申请记录 * @param data */ export function updatetusercertifications(data) { @@ -36,7 +36,7 @@ export function updatetusercertifications(data) { }) } /** - * 获取认证申请表详情 + * 获取认证申请记录详情 * @param {Id} */ export function gettusercertifications(id) { @@ -47,7 +47,7 @@ export function gettusercertifications(id) { } /** - * 删除认证申请表 + * 删除认证申请记录 * @param {主键} pid */ export function deltusercertifications(pid) { @@ -56,7 +56,7 @@ export function deltusercertifications(pid) { method: 'POST' }) } -// 导出认证申请表 +// 导出认证申请记录 export async function exporttusercertifications(query) { await downFile('liveforum/tusercertifications/export', { ...query }) } diff --git a/ZR.Vue/src/views/liveforum/tusercertifications.vue b/ZR.Vue/src/views/liveforum/tusercertifications.vue index 8f0be1e..d97d8c3 100644 --- a/ZR.Vue/src/views/liveforum/tusercertifications.vue +++ b/ZR.Vue/src/views/liveforum/tusercertifications.vue @@ -1,5 +1,5 @@ @@ -9,14 +9,22 @@ - - + + {{ item.dictLabel }} {{ item.dictValue }} + + + + {{ item.dictLabel }} + {{ item.dictValue }} + + + {{ $t('btn.search') }} {{ $t('btn.reset') }} @@ -48,7 +56,7 @@ > - + @@ -90,8 +98,8 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -