From 3373a075081a707b094c6225759a776d18ee1e53 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期三, 04 六月 2025 15:14:10 +0800
Subject: [PATCH] no message
---
Admin.NET/FZCZTB.TSCL.Application/Service/ProcurementComplaint/ProcurementComplaintService.cs | 97 ++++++++++++++++++++++++++++--------------------
1 files changed, 56 insertions(+), 41 deletions(-)
diff --git a/Admin.NET/FZCZTB.TSCL.Application/Service/ProcurementComplaint/ProcurementComplaintService.cs b/Admin.NET/FZCZTB.TSCL.Application/Service/ProcurementComplaint/ProcurementComplaintService.cs
index ba9bcc3..a9dec84 100644
--- a/Admin.NET/FZCZTB.TSCL.Application/Service/ProcurementComplaint/ProcurementComplaintService.cs
+++ b/Admin.NET/FZCZTB.TSCL.Application/Service/ProcurementComplaint/ProcurementComplaintService.cs
@@ -50,8 +50,8 @@
public async Task<SqlSugarPagedList<ProcurementComplaintOutput>> Page(PageProcurementComplaintInput input)
{
input.Keyword = input.Keyword?.Trim();
- var query = _procurementComplaintRep.AsQueryable()
- .WhereIF(!string.IsNullOrWhiteSpace(input.Keyword), u => u.ProjectCode.Contains(input.Keyword) || u.ProjectName.Contains(input.Keyword) || u.Purchaser.Contains(input.Keyword) || u.ProcurementAgency.Contains(input.Keyword) || u.Complainant.Contains(input.Keyword) || u.ProcurementSupervisionDepartment.Contains(input.Keyword) || u.Url.Contains(input.Keyword))
+ var query = _procurementComplaintRep.AsQueryable().Includes(x=>x.Complaints)
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Keyword), u => u.Complaints.Any(uu=>uu.ItemDescription.Contains(input.Keyword)))
.WhereIF(!string.IsNullOrWhiteSpace(input.ProjectCode), u => u.ProjectCode.Contains(input.ProjectCode.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.ProjectName), u => u.ProjectName.Contains(input.ProjectName.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Purchaser), u => u.Purchaser.Contains(input.Purchaser.Trim()))
@@ -73,7 +73,8 @@
[ApiDescriptionSettings(Name = "Detail"), HttpGet]
public async Task<ProcurementComplaint> Detail([FromQuery] QueryByIdProcurementComplaintInput input)
{
- return await _procurementComplaintRep.GetFirstAsync(u => u.Id == input.Id);
+
+ return await _procurementComplaintRep.AsQueryable().Where(x=>x.Id==input.Id).Includes(x=>x.Complaints.OrderBy(xx=>xx.sort).ToList()).FirstAsync();
}
/// <summary>
@@ -87,6 +88,13 @@
{
var entity = input.Adapt<ProcurementComplaint>();
entity.Id = Guid.NewGuid();
+ int index = 0;
+ if (entity.Complaints != null)
+ foreach (var item in entity.Complaints)
+ {
+ item.Id = Guid.NewGuid();
+ item.sort = index++;
+ }
return await _sqlSugarClient.InsertNav(entity).Include(x=>x.Complaints).ExecuteCommandAsync();
}
@@ -101,7 +109,14 @@
public async Task Update(UpdateProcurementComplaintInput input)
{
var entity = input.Adapt<ProcurementComplaint>();
- await _procurementComplaintRep.AsUpdateable(entity)
+ int index = 0;
+ if(entity.Complaints!=null)
+ foreach (var item in entity.Complaints)
+ {
+ item.Id = Guid.NewGuid();
+ item.sort= index++;
+ }
+ await _procurementComplaintRep.AsSugarClient().UpdateNav(entity).Include(x=>x.Complaints)
.ExecuteCommandAsync();
}
@@ -167,46 +182,46 @@
/// 瀵煎叆鏀垮簻閲囪喘鎶曡瘔鏁版嵁澶勭悊璁板綍 馃捑
/// </summary>
/// <returns></returns>
- [DisplayName("瀵煎叆鏀垮簻閲囪喘鎶曡瘔鏁版嵁澶勭悊璁板綍")]
- [ApiDescriptionSettings(Name = "Import"), HttpPost, NonUnify, UnitOfWork]
- public IActionResult ImportData([Required] IFormFile file)
- {
- lock (_procurementComplaintImportLock)
- {
- var stream = ExcelHelper.ImportData<ImportProcurementComplaintInput, ProcurementComplaint>(file, (list, markerErrorAction) =>
- {
- _sqlSugarClient.Utilities.PageEach(list, 2048, pageItems =>
- {
+ //[DisplayName("瀵煎叆鏀垮簻閲囪喘鎶曡瘔鏁版嵁澶勭悊璁板綍")]
+ //[ApiDescriptionSettings(Name = "Import"), HttpPost, NonUnify, UnitOfWork]
+ //public IActionResult ImportData([Required] IFormFile file)
+ //{
+ // lock (_procurementComplaintImportLock)
+ // {
+ // var stream = ExcelHelper.ImportData<ImportProcurementComplaintInput, ProcurementComplaint>(file, (list, markerErrorAction) =>
+ // {
+ // _sqlSugarClient.Utilities.PageEach(list, 2048, pageItems =>
+ // {
- // 鏍￠獙骞惰繃婊ゅ繀濉熀鏈被鍨嬩负null鐨勫瓧娈�
- var rows = pageItems.Where(x => {
- return true;
- }).Adapt<List<ProcurementComplaint>>();
+ // // 鏍￠獙骞惰繃婊ゅ繀濉熀鏈被鍨嬩负null鐨勫瓧娈�
+ // var rows = pageItems.Where(x => {
+ // return true;
+ // }).Adapt<List<ProcurementComplaint>>();
- var storageable = _procurementComplaintRep.Context.Storageable(rows)
- .SplitError(it => string.IsNullOrWhiteSpace(it.Item.ProjectCode), "椤圭洰缂栧彿涓嶈兘涓虹┖")
- .SplitError(it => it.Item.ProjectCode?.Length > 50, "椤圭洰缂栧彿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
- .SplitError(it => string.IsNullOrWhiteSpace(it.Item.ProjectName), "椤圭洰鍚嶇О涓嶈兘涓虹┖")
- .SplitError(it => it.Item.ProjectName?.Length > 200, "椤圭洰鍚嶇О闀垮害涓嶈兘瓒呰繃200涓瓧绗�")
- .SplitError(it => string.IsNullOrWhiteSpace(it.Item.Purchaser), "閲囪喘浜轰笉鑳戒负绌�")
- .SplitError(it => it.Item.Purchaser?.Length > 100, "閲囪喘浜洪暱搴︿笉鑳借秴杩�100涓瓧绗�")
- .SplitError(it => string.IsNullOrWhiteSpace(it.Item.ProcurementAgency), "閲囪喘浠ｇ悊鏈烘瀯涓嶈兘涓虹┖")
- .SplitError(it => it.Item.ProcurementAgency?.Length > 100, "閲囪喘浠ｇ悊鏈烘瀯闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- .SplitError(it => it.Item.Complainant?.Length > 100, "鎶曡瘔浜洪暱搴︿笉鑳借秴杩�100涓瓧绗�")
- .SplitError(it => it.Item.ProcurementSupervisionDepartment?.Length > 100, "閲囪喘鐩戠潱閮ㄩ棬闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- .SplitError(it => it.Item.Url?.Length > 255, "绾夸笂鍦板潃闀垮害涓嶈兘瓒呰繃255涓瓧绗�")
- .SplitInsert(_ => true)
- .ToStorage();
+ // var storageable = _procurementComplaintRep.Context.Storageable(rows)
+ // .SplitError(it => string.IsNullOrWhiteSpace(it.Item.ProjectCode), "椤圭洰缂栧彿涓嶈兘涓虹┖")
+ // .SplitError(it => it.Item.ProjectCode?.Length > 50, "椤圭洰缂栧彿闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
+ // .SplitError(it => string.IsNullOrWhiteSpace(it.Item.ProjectName), "椤圭洰鍚嶇О涓嶈兘涓虹┖")
+ // .SplitError(it => it.Item.ProjectName?.Length > 200, "椤圭洰鍚嶇О闀垮害涓嶈兘瓒呰繃200涓瓧绗�")
+ // .SplitError(it => string.IsNullOrWhiteSpace(it.Item.Purchaser), "閲囪喘浜轰笉鑳戒负绌�")
+ // .SplitError(it => it.Item.Purchaser?.Length > 100, "閲囪喘浜洪暱搴︿笉鑳借秴杩�100涓瓧绗�")
+ // .SplitError(it => string.IsNullOrWhiteSpace(it.Item.ProcurementAgency), "閲囪喘浠ｇ悊鏈烘瀯涓嶈兘涓虹┖")
+ // .SplitError(it => it.Item.ProcurementAgency?.Length > 100, "閲囪喘浠ｇ悊鏈烘瀯闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+ // .SplitError(it => it.Item.Complainant?.Length > 100, "鎶曡瘔浜洪暱搴︿笉鑳借秴杩�100涓瓧绗�")
+ // .SplitError(it => it.Item.ProcurementSupervisionDepartment?.Length > 100, "閲囪喘鐩戠潱閮ㄩ棬闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+ // .SplitError(it => it.Item.Url?.Length > 255, "绾夸笂鍦板潃闀垮害涓嶈兘瓒呰繃255涓瓧绗�")
+ // .SplitInsert(_ => true)
+ // .ToStorage();
- storageable.AsInsertable.ExecuteCommand();// 涓嶅瓨鍦ㄦ彃鍏�
- storageable.AsUpdateable.ExecuteCommand();// 瀛樺湪鏇存柊
+ // storageable.AsInsertable.ExecuteCommand();// 涓嶅瓨鍦ㄦ彃鍏�
+ // storageable.AsUpdateable.ExecuteCommand();// 瀛樺湪鏇存柊
- // 鏍囪閿欒淇℃伅
- markerErrorAction.Invoke(storageable, pageItems, rows);
- });
- });
+ // // 鏍囪閿欒淇℃伅
+ // markerErrorAction.Invoke(storageable, pageItems, rows);
+ // });
+ // });
- return stream;
- }
- }
+ // return stream;
+ // }
+ //}
}
--
Gitblit v1.9.1