wyk/juipnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【资金明细问题】 https://www.tapd.cn/39598945/prong/stories/view/1139598945001000131

Browse Source
This commit is contained in:
wanyongkang
2020-11-24 11:25:01 +08:00
parent 6a0caf97ba
commit 2c5ffd64a5
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Services/Hncore.Pass.BaseInfo/Controllers/UserController.cs
View File

@@ -223,7 +223,10 @@ namespace Hncore.Pass.BaseInfo.Controllers
new ExcelTitle { Property = "UserName", Title = "用户" }, new ExcelTitle { Property = "UserName", Title = "用户" },
new ExcelTitle { Property = "OperateUserName", Title = "操作人员" }, new ExcelTitle { Property = "OperateUserName", Title = "操作人员" },
new ExcelTitle { Property = "ScoreTypeName", 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); var fileBytes = ExcelHelper.ExportListToExcel(data, title);

2
Services/Hncore.Pass.BaseInfo/Service/UserScoreService.cs
View File

@@ -39,7 +39,7 @@ namespace Hncore.Pass.BaseInfo.Service
if (request.KeyWord.Has()) 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) if (request.Type.HasValue&&request.Type>0)
{ {