diff --git a/Services/Hncore.Pass.BaseInfo/Controllers/UserController.cs b/Services/Hncore.Pass.BaseInfo/Controllers/UserController.cs index 23b2f0f..5045d9a 100644 --- a/Services/Hncore.Pass.BaseInfo/Controllers/UserController.cs +++ b/Services/Hncore.Pass.BaseInfo/Controllers/UserController.cs @@ -223,7 +223,10 @@ namespace Hncore.Pass.BaseInfo.Controllers new ExcelTitle { Property = "UserName", Title = "用户" }, new ExcelTitle { Property = "OperateUserName", Title = "操作人员" }, new ExcelTitle { Property = "ScoreTypeName", Title = "资金项目" }, - new ExcelTitle { Property = "ScoreValue", Title = "金额" } + new ExcelTitle { Property = "ScoreValue", Title = "金额" }, + new ExcelTitle { Property = "Remark", Title = "备注" }, + new ExcelTitle { Property = "RestAmount1", Title = "操作前金额" }, + new ExcelTitle { Property = "RestAmount2", Title = "操作后金额" } }; var fileBytes = ExcelHelper.ExportListToExcel(data, title); diff --git a/Services/Hncore.Pass.BaseInfo/Service/UserScoreService.cs b/Services/Hncore.Pass.BaseInfo/Service/UserScoreService.cs index 522de5a..ec5eceb 100644 --- a/Services/Hncore.Pass.BaseInfo/Service/UserScoreService.cs +++ b/Services/Hncore.Pass.BaseInfo/Service/UserScoreService.cs @@ -39,7 +39,7 @@ namespace Hncore.Pass.BaseInfo.Service if (request.KeyWord.Has()) { - exp = exp.And(m => m.UserName.Contains(request.KeyWord) || m.OperateUserName.Contains(request.KeyWord)); + exp = exp.And(m => m.UserName.Contains(request.KeyWord) || m.OperateUserName.Contains(request.KeyWord) || m.ScoreTypeName.Contains(request.KeyWord) || m.Remark.Contains(request.KeyWord)); } if (request.Type.HasValue&&request.Type>0) {