diff --git a/BBWYB.Server.API/Controllers/TimeLimitTaskController.cs b/BBWYB.Server.API/Controllers/TimeLimitTaskController.cs
index e7e6d1f..deca3ce 100644
--- a/BBWYB.Server.API/Controllers/TimeLimitTaskController.cs
+++ b/BBWYB.Server.API/Controllers/TimeLimitTaskController.cs
@@ -6,6 +6,9 @@ using Microsoft.AspNetCore.Mvc;
namespace BBWYB.Server.API.Controllers
{
+ /// <summary>
+ /// 限时任务
+ /// </summary>
[Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
public class TimeLimitTaskController : BaseApiController
{
@@ -46,5 +49,15 @@ namespace BBWYB.Server.API.Controllers
{
return timeLimitTaskBusiness.TimeOutStatistics(request);
}
+
+ /// <summary>
+ /// 修改备注
+ /// </summary>
+ /// <param name="request"></param>
+ [HttpPost]
+ public void EditTimeLimitTaskRemark([FromBody] EditTimeLimitTaskRemarkRequest request)
+ {
+ timeLimitTaskBusiness.EditTimeLimitTaskRemark(request);
+ }
}
}
diff --git a/BBWYB.Server.Business/TimeLimitTask/TimeLimitTaskBusiness.cs b/BBWYB.Server.Business/TimeLimitTask/TimeLimitTaskBusiness.cs
index 436af85..a3836de 100644
--- a/BBWYB.Server.Business/TimeLimitTask/TimeLimitTaskBusiness.cs
+++ b/BBWYB.Server.Business/TimeLimitTask/TimeLimitTaskBusiness.cs
@@ -29,6 +29,8 @@ namespace BBWYB.Server.Business
if (request.PageSize > 100)
request.PageSize = 100;
+ var shopList = venderBusiness.GetShopList(request.ShopId, Model.Enums.Platform.拳探);
+
request.EndDate = request.EndDate.Date.AddDays(1).AddSeconds(-1);
var list = fsql.Select<TimeLimitTask>().WhereIf(request.ShopId != null, t => t.ShopId == request.ShopId)
.Where(t => t.CreateTme >= request.StartDate && t.CreateTme <= request.EndDate)
@@ -39,6 +41,11 @@ namespace BBWYB.Server.Business
.Count(out var count)
.Page(request.PageIndex, request.PageSize)
.ToList<TimeLimitTaskResponse>();
+ foreach (var task in list)
+ {
+ var shopId = task.ShopId.ToString();
+ task.ShopName = shopList.FirstOrDefault(s => s.ShopId == shopId)?.ShopName;
+ }
return new TimeLimitTaskListResponse()
{
Count = count,
@@ -52,6 +59,7 @@ namespace BBWYB.Server.Business
throw new BusinessException("开始时间不能大于结束时间");
request.EndDate = request.EndDate.Date.AddDays(1).AddSeconds(-1);
+ var shopList = venderBusiness.GetShopList(request.ShopId, Model.Enums.Platform.拳探);
var list = new List<TimeLimitTaskStatisticsResponse>();
var shopIdList = new List<long>();
@@ -81,9 +89,10 @@ namespace BBWYB.Server.Business
foreach (var shopId in shopIdList)
{
+ var sid = shopId.ToString();
var response = new TimeLimitTaskStatisticsResponse();
response.ShopId = shopId;
-
+ response.ShopName = shopList.FirstOrDefault(s => s.ShopId == sid)?.ShopName;
var purchaseTaskCount = purchaseTaskCountGroups.FirstOrDefault(x => x.ShopId == response.ShopId)?.TaskCount ?? 0;
var purchaseTaskTimeOutCount = purchaseTaskTimOutCountGroups.FirstOrDefault(x => x.ShopId == response.ShopId)?.TaskCount ?? 0;
@@ -94,5 +103,10 @@ namespace BBWYB.Server.Business
return list;
}
+
+ public void EditTimeLimitTaskRemark(EditTimeLimitTaskRemarkRequest request)
+ {
+ fsql.Update<TimeLimitTask>(request.TaskId).Set(t => t.Remark, request.Remark).ExecuteAffrows();
+ }
}
}
diff --git a/BBWYB.Server.Model/Db/TimeLimitTask/TimeLimitTask.cs b/BBWYB.Server.Model/Db/TimeLimitTask/TimeLimitTask.cs
index 77433f6..0f324ae 100644
--- a/BBWYB.Server.Model/Db/TimeLimitTask/TimeLimitTask.cs
+++ b/BBWYB.Server.Model/Db/TimeLimitTask/TimeLimitTask.cs
@@ -7,65 +7,72 @@ namespace BBWYB.Server.Model.Db
/// 时限任务表
/// </summary>
[Table(Name = "timelimittask", DisableSyncStructure = true)]
- public partial class TimeLimitTask {
-
- [Column(IsPrimary = true)]
- public long Id { get; set; }
-
- /// <summary>
- /// 完成时间
- /// </summary>
- [Column(DbType = "datetime")]
- public DateTime? CompletionTime { get; set; }
-
- /// <summary>
- /// 创建时间
- /// </summary>
- [Column(DbType = "datetime")]
- public DateTime? CreateTme { get; set; }
-
- /// <summary>
- /// 付款时间
- /// </summary>
- [Column(DbType = "datetime")]
- public DateTime? PayTime { get; set; }
-
- /// <summary>
- /// 到期时间(非时间长度，而是具体的时间)
- /// </summary>
- [Column(DbType = "datetime")]
- public DateTime? ExpirationTime { get; set; }
-
- /// <summary>
- /// 是否及时完成
- /// </summary>
-
- public bool? IsTimely { get; set; }
-
- /// <summary>
- /// 订单Id (采购任务时有效)
- /// </summary>
- [Column(StringLength = 50)]
- public string OrderId { get; set; }
-
- /// <summary>
- /// 店铺Id
- /// </summary>
-
- public long? ShopId { get; set; }
-
- /// <summary>
- /// SKU
- /// </summary>
- [Column(StringLength = 50)]
- public string SkuId { get; set; }
-
- /// <summary>
- /// 任务类型(采购任务=0,合格证拟定任务=10,合格证补充任务=11)
- /// </summary>
- [Column(MapType = typeof(int?))]
- public Enums.TimeLimitTaskType? TaskType { get; set; }
-
- }
+ public partial class TimeLimitTask
+ {
+
+ [Column(IsPrimary = true)]
+ public long Id { get; set; }
+
+ /// <summary>
+ /// 完成时间
+ /// </summary>
+ [Column(DbType = "datetime")]
+ public DateTime? CompletionTime { get; set; }
+
+ /// <summary>
+ /// 创建时间
+ /// </summary>
+ [Column(DbType = "datetime")]
+ public DateTime? CreateTme { get; set; }
+
+ /// <summary>
+ /// 付款时间
+ /// </summary>
+ [Column(DbType = "datetime")]
+ public DateTime? PayTime { get; set; }
+
+ /// <summary>
+ /// 到期时间(非时间长度，而是具体的时间)
+ /// </summary>
+ [Column(DbType = "datetime")]
+ public DateTime? ExpirationTime { get; set; }
+
+ /// <summary>
+ /// 是否及时完成
+ /// </summary>
+
+ public bool? IsTimely { get; set; }
+
+ /// <summary>
+ /// 订单Id (采购任务时有效)
+ /// </summary>
+ [Column(StringLength = 50)]
+ public string OrderId { get; set; }
+
+ /// <summary>
+ /// 店铺Id
+ /// </summary>
+
+ public long? ShopId { get; set; }
+
+ /// <summary>
+ /// SKU
+ /// </summary>
+ [Column(StringLength = 50)]
+ public string SkuId { get; set; }
+
+ /// <summary>
+ /// 任务类型(采购任务=0,合格证拟定任务=10,合格证补充任务=11)
+ /// </summary>
+ [Column(MapType = typeof(int?))]
+ public Enums.TimeLimitTaskType? TaskType { get; set; }
+
+ /// <summary>
+ /// 备注
+ /// </summary>
+ [Column(StringLength = 500)]
+ public string Remark { get; set; }
+
+ }
}
diff --git a/BBWYB.Server.Model/Dto/Request/TimeLimitTask/EditTimeLimitTaskRemarkRequest.cs b/BBWYB.Server.Model/Dto/Request/TimeLimitTask/EditTimeLimitTaskRemarkRequest.cs
new file mode 100644
index 0000000..df2bf69
--- /dev/null
+++ b/BBWYB.Server.Model/Dto/Request/TimeLimitTask/EditTimeLimitTaskRemarkRequest.cs
@@ -0,0 +1,9 @@
+namespace BBWYB.Server.Model.Dto
+{
+ public class EditTimeLimitTaskRemarkRequest
+ {
+ public long TaskId { get; set; }
+
+ public string Remark { get; set; }
+ }
+}
diff --git a/BBWYB.Server.Model/Dto/Response/TimeLimitTask/TimeLimitTaskResponse.cs b/BBWYB.Server.Model/Dto/Response/TimeLimitTask/TimeLimitTaskResponse.cs
index b4f0378..802c9ad 100644
--- a/BBWYB.Server.Model/Dto/Response/TimeLimitTask/TimeLimitTaskResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/TimeLimitTask/TimeLimitTaskResponse.cs
@@ -4,5 +4,6 @@ namespace BBWYB.Server.Model.Dto
{
public class TimeLimitTaskResponse : TimeLimitTask
{
+ public string ShopName { get; set; }
}
}
diff --git a/BBWYB.Server.Model/Dto/Response/TimeLimitTask/TimeLimitTaskStatisticsResponse.cs b/BBWYB.Server.Model/Dto/Response/TimeLimitTask/TimeLimitTaskStatisticsResponse.cs
index 049ad8b..ee2e09b 100644
--- a/BBWYB.Server.Model/Dto/Response/TimeLimitTask/TimeLimitTaskStatisticsResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/TimeLimitTask/TimeLimitTaskStatisticsResponse.cs
@@ -4,6 +4,8 @@
{
public long ShopId { get; set; }
+ public string ShopName { get; set; }
+
/// <summary>
/// 采购超时率(%)
/// </summary>