yanghongwei
/
lg_backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://101.43.201.20:3000/yanghongwei/lg_backend

This commit is contained in:
yanghongwei 2024-07-27 20:53:36 +08:00
parent bb455678cc 61580ac13b
commit e3c18ba952
4 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
langguanApi/Controllers/TransportController.cs
View File

@ -61,7 +61,7 @@ namespace langguanApi.Controllers
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("addwasherlist")] [HttpPost("addwasherlist")]
public async Task<IActionResult> AddWasherList(List<AddWasher> input) public async Task<IActionResult> AddWasherList([FromBody] List<AddWasher> input)
{ {
await _washerService.addWasher(input); await _washerService.addWasher(input);
return Ok(new ApiResult() { code = 0 }); return Ok(new ApiResult() { code = 0 });
@ -97,7 +97,7 @@ namespace langguanApi.Controllers
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost("addruckscaleslist")] [HttpPost("addruckscaleslist")]
public async Task<IActionResult> AddRuckScalesList(List<AddTruckScalesDto> input) public async Task<IActionResult> AddRuckScalesList([FromBody] List<AddTruckScalesDto> input)
{ {
await _truckScalesService.AddTruckScalesList(input); await _truckScalesService.AddTruckScalesList(input);
return Ok(new ApiResult() { code = 0 }); return Ok(new ApiResult() { code = 0 });

2
langguanApi/Model/Washer.cs
View File

@ -154,7 +154,7 @@
} }
/// <summary> /// <summary>
/// 添加洗车机 /// 获取洗车机
/// </summary> /// </summary>
public class GetWasherDto public class GetWasherDto
{ {

3
langguanApi/Service/TransportService.cs
View File

@ -110,6 +110,8 @@ namespace langguanApi.Service
}); });
} }
} }
if (result.Any())
{
if (!string.IsNullOrWhiteSpace(input.startTime)) if (!string.IsNullOrWhiteSpace(input.startTime))
{ {
result.Where(p => Convert.ToDateTime(p.Time) >= Convert.ToDateTime(input.startTime)).ToList(); result.Where(p => Convert.ToDateTime(p.Time) >= Convert.ToDateTime(input.startTime)).ToList();
@ -119,6 +121,7 @@ namespace langguanApi.Service
result.Where(p => Convert.ToDateTime(p.Time) <= Convert.ToDateTime(input.endTime)).ToList(); result.Where(p => Convert.ToDateTime(p.Time) <= Convert.ToDateTime(input.endTime)).ToList();
} }
result = result.Skip(input.current - 1).Take(input.pageSize).ToList(); result = result.Skip(input.current - 1).Take(input.pageSize).ToList();
}
return result; return result;
} }

7
langguanApi/Service/WasherService.cs
View File

@ -23,7 +23,7 @@ namespace langguanApi.Service
List<Washer> result = new List<Washer>(); List<Washer> result = new List<Washer>();
foreach (var item in input) foreach (var item in input)
{ {
var entity = input.Adapt<Washer>(); var entity = item.Adapt<Washer>();
result.Add(entity); result.Add(entity);
} }
@ -66,6 +66,8 @@ namespace langguanApi.Service
entity.StateString = item.State == 0 ? "停止" : "运行"; entity.StateString = item.State == 0 ? "停止" : "运行";
washerHistroyResult.Add(entity); washerHistroyResult.Add(entity);
} }
if (washerHistroyResult.Any())
{
if (!string.IsNullOrWhiteSpace(input.startTime)) if (!string.IsNullOrWhiteSpace(input.startTime))
{ {
washerHistroyResult = washerHistroyResult.Where(p => Convert.ToDateTime(p.Time) >= Convert.ToDateTime(input.startTime)).ToList(); washerHistroyResult = washerHistroyResult.Where(p => Convert.ToDateTime(p.Time) >= Convert.ToDateTime(input.startTime)).ToList();
@ -74,10 +76,11 @@ namespace langguanApi.Service
{ {
washerHistroyResult = washerHistroyResult.Where(p => Convert.ToDateTime(p.Time) <= Convert.ToDateTime(input.endTime)).ToList(); washerHistroyResult = washerHistroyResult.Where(p => Convert.ToDateTime(p.Time) <= Convert.ToDateTime(input.endTime)).ToList();
} }
if (washerHistroyResult.Any()) if (string.IsNullOrWhiteSpace(input.startTime) && string.IsNullOrWhiteSpace(input.endTime))
{ {
washerHistroyResult = washerHistroyResult.OrderByDescending(p => p.Time).Take(30).ToList(); washerHistroyResult = washerHistroyResult.OrderByDescending(p => p.Time).Take(30).ToList();
} }
}
return washerHistroyResult; return washerHistroyResult;
} }
} }