zhibinlv
/
QRAPI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改调用明细查询方法

master
周红军 1 week ago
parent
f51817a0ad
commit
db154b56c1
2 changed files with 54 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
  2. 64
      API/Wood.Service/Controllers/TaskSubService.cs

22
API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
View File

@ -311,6 +311,28 @@ namespace TaskManager.Controllers
return Ok(pagedResult);
}
public async Task<PagedResult<T>> 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<Func<T, bool>> filter = null;
var pagedResult = await _repository.GetDataPagedAsync(filter, pagingParams, input.Condition);
return pagedResult;
}
/// <summary>
/// 导出New
/// </summary>

64
API/Wood.Service/Controllers/TaskSubService.cs
View File

@ -58,30 +58,30 @@ namespace Wood.Service.Controllers
var stockservice = _builder.GetRequiredService<CherySupplierProSchedulingService>();
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<CherySupplierProSchedulingService>();
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<CherySupplierInfoService>();
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<CherySupplierEmployeeService>();
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<CherySupplierBomService>();
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<CherySupplierProCpsService>();
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<CherySupplierProDataService>();
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<CherySupplierProFirstPassyieldService>();
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<CherySupplierProStationFirstPassyieldService>();
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<CherySupplierProFlawService>();
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<CherySupplierProEnvironmentService>();
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<CherySupplierProOeeAchievementRateService>();
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<CherySupplierProOeeTimeDetailsService>();
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<CherySupplierProMaterialDataService>();
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<CherySupplierProProcessEquipmentService>();
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<CherySupplierProProcessService>();
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);

Write Preview
Loading…
Cancel
Save