diff --git a/langguanApi.xml b/langguanApi.xml
index 8f8f704..47f306b 100644
--- a/langguanApi.xml
+++ b/langguanApi.xml
@@ -261,7 +261,20 @@
-
+
+
+ Add a new ledger
+
+
+
+
+
+
+ 头部统计
+
+
+
+
Export all ledgers
@@ -411,6 +424,13 @@
+
+
+ 新增清洁运输
+
+
+
+
登陆
@@ -2145,7 +2165,7 @@
-
+
导出数据
diff --git a/langguanApi/Controllers/LedgerController.cs b/langguanApi/Controllers/LedgerController.cs
index 422766a..a0a4c20 100644
--- a/langguanApi/Controllers/LedgerController.cs
+++ b/langguanApi/Controllers/LedgerController.cs
@@ -1,4 +1,5 @@
using langguanApi.Model;
+using langguanApi.Model.Entity;
using langguanApi.Service;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
@@ -23,19 +24,40 @@ namespace langguanApi.Controllers
///
///
[HttpGet("list")]
- public async Task list([FromQuery]reqpage input)
+ public async Task list([FromQuery] reqpage input)
{
var result = await _ledgerService.GetPage(input);
return Ok(result);
}
///
+ /// Add a new ledger
+ ///
+ ///
+ ///
+ [HttpPost("add")]
+ public async Task add(LedgerDTO input)
+ {
+ await _ledgerService.AddLedger(input);
+ return Ok(new ApiResult { code = 0 });
+ }
+ ///
+ /// 头部统计
+ ///
+ ///
+ [HttpGet("HeaderCount")]
+ public async Task HeaderCount()
+ {
+ var result = await _ledgerService.HeaderCount();
+ return Ok(new ApiResult { code = 0, data = result });
+ }
+ ///
/// Export all ledgers
///
///
///
///
[HttpGet("export")]
- public async Task Export(DateTime start, DateTime end)
+ public async Task Export(DateTime? start, DateTime? end)
{
var result = await _ledgerService.Export(start, end);
return File(result, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "台账.xlsx");
diff --git a/langguanApi/Controllers/TransportController.cs b/langguanApi/Controllers/TransportController.cs
index 250c553..ff61ef3 100644
--- a/langguanApi/Controllers/TransportController.cs
+++ b/langguanApi/Controllers/TransportController.cs
@@ -38,5 +38,16 @@ namespace langguanApi.Controllers
var result = await _transportService.GetCount();
return Ok(result);
}
+ ///
+ /// 新增清洁运输
+ ///
+ ///
+ ///
+ [HttpPatch("add")]
+ public async Task Add(Transport input)
+ {
+ await _transportService.addTransport(input);
+ return Ok(new ApiResult() { code = 0 });
+ }
}
}
diff --git a/langguanApi/Model/Transport.cs b/langguanApi/Model/Transport.cs
index 16ca16c..4883169 100644
--- a/langguanApi/Model/Transport.cs
+++ b/langguanApi/Model/Transport.cs
@@ -30,5 +30,9 @@
/// 注册日期
///
public DateTime Registered { get; set; }
+ ///
+ /// 货物类型
+ ///
+ public string Goods { get; set; }
}
}
diff --git a/langguanApi/Service/HomeService.cs b/langguanApi/Service/HomeService.cs
index 5921405..bd254f2 100644
--- a/langguanApi/Service/HomeService.cs
+++ b/langguanApi/Service/HomeService.cs
@@ -80,7 +80,6 @@ namespace langguanApi.Service
yesterday = 0.8,
lastWeek = 0.6
};
- var d1 = await _hj212Service.GetTodayData();
Func> getTodayFunc = async () => await _hj212Service.GetTodayData();
var today = await _cacheManager.GetConvertVale(RedisKeylist.Today, getTodayFunc, 60 * 30);
return new ApiResult
diff --git a/langguanApi/Service/LedgerService.cs b/langguanApi/Service/LedgerService.cs
index f167882..1f18d0c 100644
--- a/langguanApi/Service/LedgerService.cs
+++ b/langguanApi/Service/LedgerService.cs
@@ -28,28 +28,34 @@ namespace langguanApi.Service
var enity = input.Adapt();
await base.CreateAsync(enity);
}
+ public async Task