From db154b56c1e534e4ce345dec66e98133a380af83 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Fri, 6 Jun 2025 13:14:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E7=94=A8=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CheryRecurringJobInputPageController.cs | 22 +++++++ .../Controllers/TaskSubService.cs | 64 +++++++++---------- 2 files changed, 54 insertions(+), 32 deletions(-) diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs index b163409..252c614 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs @@ -311,6 +311,28 @@ namespace TaskManager.Controllers return Ok(pagedResult); } + public async Task> GetTaskDataPaged(RequestInputBase input) + { + var pagingParams = new PagingParams + { + PageNumber = input.pageNumber, + PageSize = input.pageSize, + SortBy = input.sortBy, + IsAscending = input.isAscending, + }; + + + var json = JsonSerializer.Serialize(input); + + + + // 可以在这里构建表达式树过滤条件 + Expression> filter = null; + + var pagedResult = await _repository.GetDataPagedAsync(filter, pagingParams, input.Condition); + return pagedResult; + } + /// /// 导出New /// diff --git a/API/Wood.Service/Controllers/TaskSubService.cs b/API/Wood.Service/Controllers/TaskSubService.cs index ae13e7c..ef788d8 100644 --- a/API/Wood.Service/Controllers/TaskSubService.cs +++ b/API/Wood.Service/Controllers/TaskSubService.cs @@ -58,30 +58,30 @@ namespace Wood.Service.Controllers var stockservice = _builder.GetRequiredService(); var stocktask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(stocktask); - var stockresult = await stockservice.GetDataPaged(requestInputBase); - return Ok(stockresult.Value); + var stockresult = await stockservice.GetTaskDataPaged(requestInputBase); + return Ok(stockresult); case "SUPPLIER_PRO_SCHEDULING": var schedservice = _builder.GetRequiredService(); var schedtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(schedtask); - var schedresult = await schedservice.GetDataPaged(requestInputBase); - return Ok(schedresult.Value); + var schedresult = await schedservice.GetTaskDataPaged(requestInputBase); + return Ok(schedresult); case "SUPPLIER_INFO": var infoservice = _builder.GetRequiredService(); var infotask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(infotask); - var inforesult = await infoservice.GetDataPaged(requestInputBase); - return Ok(inforesult.Value); + var inforesult = await infoservice.GetTaskDataPaged(requestInputBase); + return Ok(inforesult); case "SUPPLIER_EMPLOYEE"://人员资质信息 var emplyeeservice = _builder.GetRequiredService(); var emplyeetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(emplyeetask); - var emplyeeresult = await emplyeeservice.GetDataPaged(requestInputBase); - return Ok(emplyeeresult.Value); + var emplyeeresult = await emplyeeservice.GetTaskDataPaged(requestInputBase); + return Ok(emplyeeresult); case "SUPPLIER_BOM"://BOM主数据 @@ -89,88 +89,88 @@ namespace Wood.Service.Controllers var bomservice = _builder.GetRequiredService(); var bomtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(bomtask); - var bomresult = await bomservice.GetDataPaged(requestInputBase); - return Ok(bomresult.Value); + var bomresult = await bomservice.GetTaskDataPaged(requestInputBase); + return Ok(bomresult); case "SUPPLIER_PRO_CPS"://过程控制项质量数据 var cpsservice = _builder.GetRequiredService(); var cpstask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(cpstask); - var result = await cpsservice.GetDataPaged(requestInputBase); - return Ok(result.Value); + var cpsresult = await cpsservice.GetTaskDataPaged(requestInputBase); + return Ok(cpsresult); case "SUPPLIER_PRO_DATA": var dataservice = _builder.GetRequiredService(); var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(datatask); - var dataresult = await dataservice.GetDataPaged(requestInputBase); - return Ok(dataresult.Value); + var dataresult = await dataservice.GetTaskDataPaged(requestInputBase); + return Ok(dataresult); case "SUPPLIER_PRO_FIRST_PASSYIELD": var passyieldservice = _builder.GetRequiredService(); var passyieldtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(passyieldtask); - var passyieldresult = await passyieldservice.GetDataPaged(requestInputBase); - return Ok(passyieldresult.Value); + var passyieldresult = await passyieldservice.GetTaskDataPaged(requestInputBase); + return Ok(passyieldresult); case "SUPPLIER_PRO_STATION_FIRST_PASSYIELD": var pasyservice = _builder.GetRequiredService(); var pasytask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(pasytask); - var pasyresult = await pasyservice.GetDataPaged(requestInputBase); - return Ok(pasyresult.Value); + var pasyresult = await pasyservice.GetTaskDataPaged(requestInputBase); + return Ok(pasyresult); case "SUPPLIER_PRO_FLAW": var flawservice = _builder.GetRequiredService(); var flawtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(flawtask); - var flawresult = await flawservice.GetDataPaged(requestInputBase); - return Ok(flawresult.Value); + var flawresult = await flawservice.GetTaskDataPaged(requestInputBase); + return Ok(flawresult); case "SUPPLIER_PRO_ENVIRONMENT": var envservice = _builder.GetRequiredService(); var envtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(envtask); - var envresult = await envservice.GetDataPaged(requestInputBase); - return Ok(envresult.Value); + var envresult = await envservice.GetTaskDataPaged(requestInputBase); + return Ok(envresult); case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE": var rateservice = _builder.GetRequiredService(); var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(ratetask); - var rateresult = await rateservice.GetDataPaged(requestInputBase); - return Ok(rateresult.Value); + var rateresult = await rateservice.GetTaskDataPaged(requestInputBase); + return Ok(rateresult); case "SUPPLIER_PRO_OEE_TIME_DETAILS": var detailservice = _builder.GetRequiredService(); var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(detailtask); - var detailresult = await detailservice.GetDataPaged(requestInputBase); - return Ok(detailresult.Value); + var detailresult = await detailservice.GetTaskDataPaged(requestInputBase); + return Ok(detailresult); case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据 var materialservice = _builder.GetRequiredService(); var materialtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(materialtask); - var materialresult = await materialservice.GetDataPaged(requestInputBase); - return Ok(materialresult.Value); + var materialresult = await materialservice.GetTaskDataPaged(requestInputBase); + return Ok(materialresult); case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备 var eqservice = _builder.GetRequiredService(); var eqtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(eqtask); - var eqresult = await eqservice.GetDataPaged(requestInputBase); - return Ok(eqresult.Value); + var eqresult = await eqservice.GetTaskDataPaged(requestInputBase); + return Ok(eqresult); case "SUPPLIER_PRO_PROCESS"://工艺 var processservice = _builder.GetRequiredService(); var processtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(processtask); - var processresult = await processservice.GetDataPaged(requestInputBase); - return Ok(processresult.Value); + var processresult = await processservice.GetTaskDataPaged(requestInputBase); + return Ok(processresult);