yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 优化datetime格式

Browse Source
This commit is contained in:
liguoyang
2024-05-30 20:44:41 +08:00
parent 75bd31d4a5
commit 5c30638274
30 changed files with 275 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordMyResponse.cs
View File

@@ -1,4 +1,5 @@
using Newtonsoft.Json;
using Kurisu.AspNetCore.Utils.Converters;
using Newtonsoft.Json;
namespace Dlhis.Canteen.MealSupplementRecord.Response;
@@ -7,6 +8,7 @@ public class MealSupplementRecordItemResponse
/// <summary>
/// 餐补日期
/// </summary>
[JsonConverter(typeof(ToDateJsonConverter))]
public DateTime Date { get; set; }
[JsonIgnore]

3
Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordResponse.cs
View File

@@ -1,5 +1,7 @@
using Dlhis.Entity.Basic.Enums;
using Kurisu.AspNetCore.Utils.Converters;
using Kurisu.AspNetCore.Utils.Extensions;
using Newtonsoft.Json;
namespace Dlhis.Canteen.MealSupplementRecord.Response;
@@ -30,6 +32,7 @@ public class MealSupplementRecordResponse
/// <summary>
/// 考勤日期
/// </summary>
[JsonConverter(typeof(ToDateJsonConverter))]
public DateTime Date { get; set; }
/// <summary>

2
Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs
View File

@@ -28,7 +28,7 @@ public class OrdersController : ControllerBase
}
/// <summary>
/// 添加充值/消费订单
/// 添加充值
/// </summary>
/// <param name="request"></param>
/// <returns></returns>

62
Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs
View File

@@ -1,62 +0,0 @@
using Dlhis.Entity.Canteen.Enums;
using Kurisu.AspNetCore.Utils.Extensions;
namespace Dlhis.Canteen.Order.Response;
public class BalanceRecordByUserResponse
{
/// <summary>
/// 流水号
/// </summary>
public string No { get; set; }
/// <summary>
/// 金额
/// </summary>
public string Name { get; set; }
/// <summary>
/// 学工号
/// </summary>
public string UserCode { get; set; }
/// <summary>
/// 部门号
/// </summary>
public string DepartmentNo { get; set; }
/// <summary>
/// 来源
/// </summary>
public BalanceRecordSourceEnumType Source { get; set; }
/// <summary>
/// 来源CN
/// </summary>
public string SourceCN => Source.GetDescription();
/// <summary>
/// 收入/支出
/// </summary>
public BalanceRecordTypeEnumType Type { get; set; }
/// <summary>
/// 收入/支出
/// </summary>
public string TypeCN => Type.GetDescription();
/// <summary>
/// 金额 + - 表示
/// </summary>
public decimal Amount { get; set; }
/// <summary>
/// 消费时间
/// </summary>
public DateTime CostDateTime { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}

94
Src/Dlhis.Canteen/Order/Response/BalanceRecordCostIdResponse.cs
View File

@@ -1,94 +0,0 @@
namespace Dlhis.Canteen.Order.Response
{
public class BalanceRecordCostIdResponse
{
/// <summary>
/// 成本中心
/// </summary>
public string CostId { get; set; }
/// <summary>
/// 早餐人数
/// </summary>
public int BreakfastNumberOfPeople { get; set; }
/// <summary>
/// 早餐单价price
/// </summary>
public decimal BreakfastPrice { get; set; }
/// <summary>
/// 早餐金额
/// </summary>
public decimal BreakfastAmount { get; set; }
/// <summary>
/// 午餐人数
/// </summary>
public int LunchNumberOfPeople { get; set; }
/// <summary>
/// 午餐单价price
/// </summary>
public decimal LunchPrice { get; set; }
/// <summary>
/// 午餐金额
/// </summary>
public decimal LunchAmount { get; set; }
/// <summary>
/// 晚餐人数
/// </summary>
public int DinnerNumberOfPeople { get; set; }
/// <summary>
/// 晚餐单价price
/// </summary>
public decimal DinnerPrice { get; set; }
/// <summary>
/// 晚餐金额
/// </summary>
public decimal DinnerAmount { get; set; }
/// <summary>
/// 宵夜人数
/// </summary>
public int LateNightNumberOfPeople { get; set; }
/// <summary>
/// 宵夜单价price
/// </summary>
public decimal LateNightPrice { get; set; }
/// <summary>
/// 宵夜金额
/// </summary>
public decimal LateNightAmount { get; set; }
/// <summary>
/// 总金额
/// </summary>
public decimal TotalAmount { get; set; }
/// <summary>
/// 总人数
/// </summary>
public int TotalNumberOfPeople { get; set; }
}
}

9
Src/Dlhis.Canteen/Order/Response/BalanceRecordDeviceResponse.cs
View File

@@ -1,5 +1,7 @@
using Dlhis.Entity.Canteen.Enums;
using Kurisu.AspNetCore.Utils.Converters;
using Kurisu.AspNetCore.Utils.Extensions;
using Newtonsoft.Json;
namespace Dlhis.Canteen.Order.Response;
@@ -40,6 +42,7 @@ public class BalanceRecordDeviceResponse
/// <summary>
/// 所属成本日期
/// </summary>
[JsonConverter(typeof(ToDateJsonConverter))]
public DateTime CostDate { get; set; }
/// <summary>
@@ -99,9 +102,3 @@ public class BalanceRecordDeviceResponse
/// </summary>
public string TenantName { get; set; }
}
public class BalanceRecordDeviceItemResponse
{
}

8
Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs
View File

@@ -1,5 +1,7 @@
using Dlhis.Entity.Canteen.Enums;
using Kurisu.AspNetCore.Utils.Converters;
using Kurisu.AspNetCore.Utils.Extensions;
using Newtonsoft.Json;
namespace Dlhis.Canteen.Order.Response;
@@ -46,6 +48,7 @@ public class BalanceRecordResponse
/// <summary>
/// 所属成本日期
/// </summary>
[JsonConverter(typeof(ToDateJsonConverter))]
public DateTime CostDate { get; set; }
/// <summary>
@@ -57,12 +60,14 @@ public class BalanceRecordResponse
/// 来源
/// </summary>
public BalanceRecordSourceEnumType Source { get; set; }
public string SourceDesc => Source.GetDescription();
/// <summary>
/// 收入/支出
/// </summary>
public BalanceRecordTypeEnumType Type { get; set; }
public string TypeDesc => Type.GetDescription();
/// <summary>
@@ -79,6 +84,7 @@ public class BalanceRecordResponse
/// 餐次
/// </summary>
public ShiftEnumType? ShiftType { get; set; }
/// <summary>
/// 餐次
/// </summary>
@@ -123,4 +129,4 @@ public class BalanceRecordResponse
/// 人事范围
/// </summary>
public string Werks { get; set; }
}
}

113
Src/Dlhis.Canteen/Order/Response/BalanceRecordSummaryRespones.cs
View File

@@ -1,113 +0,0 @@
using SqlSugar;
namespace Dlhis.Canteen.Order.Response
{
public class BalanceRecordSummaryRespones
{
/// <summary>
/// 部门号
/// </summary>
public string DepartmentNo { get; set; }
/// <summary>
/// 部门名称
/// </summary>
public string DepartmentName { get; set; }
/// <summary>
/// 成本中心
/// </summary>
public string CostId { get; set; }
/// <summary>
/// 消费者所在基地
/// </summary>
public string OriginTenantId { get; set; }
/// <summary>
/// 早餐人数
/// </summary>
public int BreakfastNumberOfPeople { get; set; }
/// <summary>
/// 早餐单价price
/// </summary>
public decimal BreakfastPrice { get; set; }
/// <summary>
/// 早餐金额
/// </summary>
public decimal BreakfastAmount { get; set; }
/// <summary>
/// 午餐人数
/// </summary>
public int LunchNumberOfPeople { get; set; }
/// <summary>
/// 午餐单价price
/// </summary>
public decimal LunchPrice { get; set; }
/// <summary>
/// 午餐金额
/// </summary>
public decimal LunchAmount { get; set; }
/// <summary>
/// 晚餐人数
/// </summary>
public int DinnerNumberOfPeople { get; set; }
/// <summary>
/// 晚餐单价price
/// </summary>
public decimal DinnerPrice { get; set; }
/// <summary>
/// 晚餐金额
/// </summary>
public decimal DinnerAmount { get; set; }
/// <summary>
/// 宵夜人数
/// </summary>
public int LateNightNumberOfPeople { get; set; }
/// <summary>
/// 宵夜单价price
/// </summary>
public decimal LateNightPrice { get; set; }
/// <summary>
/// 宵夜金额
/// </summary>
public decimal LateNightAmount { get; set; }
/// <summary>
/// 总金额
/// </summary>
public decimal TotalAmount { get; set; }
/// <summary>
/// 总人数
/// </summary>
public int TotalNumberOfPeople { get; set; }
}
}

65
Src/Dlhis.Canteen/Order/Response/ConsumeNumberResponse.cs
View File

@@ -1,40 +1,39 @@
namespace Dlhis.Canteen.Order.Response
namespace Dlhis.Canteen.Order.Response;
public class ConsumeNumberResponse
{
public class ConsumeNumberResponse
{
/// <summary>
/// 消费机总数
/// </summary>
public int Total { get; set; }
/// <summary>
/// 消费机总数
/// </summary>
public int Total { get; set; }
/// <summary>
/// 消费机离线数
/// </summary>
public int OffNumber { get; set; }
/// <summary>
/// 消费机离线数
/// </summary>
public int OffNumber { get; set; }
/// <summary>
/// 营业点总数
/// </summary>
public int PlaceNumber { get; set; }
/// <summary>
/// 营业点总数
/// </summary>
public int PlaceNumber { get; set; }
/// <summary>
/// 可消费人数
/// </summary>
public int ConsumerableNumber { get; set; }
/// <summary>
/// 可消费人数
/// </summary>
public int ConsumerableNumber { get; set; }
/// <summary>
/// 人均日消费额
/// </summary>
public int DailyNumber { get; set; }
/// <summary>
/// 人均日消费额
/// </summary>
public int DailyNumber { get; set; }
/// <summary>
/// 日消费额走势图
/// </summary>
public List<ConsumptionTrendResponse> Days { get; set; }
/// <summary>
/// 日消费额走势图
/// </summary>
public List<ConsumptionTrendResponse> Days { get; set; }
/// <summary>
/// 月消费额走势图
/// </summary>
public List<ConsumptionTrendResponse> Months { get; set; }
}
}
/// <summary>
/// 月消费额走势图
/// </summary>
public List<ConsumptionTrendResponse> Months { get; set; }
}

33
Src/Dlhis.Canteen/Order/Response/ConsumptionTrendResponse.cs
View File

@@ -1,20 +1,19 @@
namespace Dlhis.Canteen.Order.Response
namespace Dlhis.Canteen.Order.Response;
public class ConsumptionTrendResponse
{
public class ConsumptionTrendResponse
{
/// <summary>
/// 时间
/// </summary>
public string DateTime { get; set; }
/// <summary>
/// 时间
/// </summary>
public string DateTime { get; set; }
/// <summary>
/// 当日/月消费总额
/// </summary>
public decimal CurrentAmount { get; set; }
/// <summary>
/// 当日/月消费总额
/// </summary>
public decimal CurrentAmount { get; set; }
/// <summary>
/// 消费总额
/// </summary>
public decimal TotalAmount { get; set; }
}
}
/// <summary>
/// 消费总额
/// </summary>
public decimal TotalAmount { get; set; }
}

214
Src/Dlhis.Canteen/Order/Response/DevicePageResponseResponse.cs
View File

@@ -1,117 +1,115 @@
using Dlhis.Entity.Device.Enums;
using Kurisu.AspNetCore.Utils.Extensions;
namespace Dlhis.Canteen.Order.Response
namespace Dlhis.Canteen.Order.Response;
public class DevicePageResponse
{
public class DevicePageResponse
public long Id { get; set; }
/// <summary>
/// 设备code
/// </summary>
public Guid Code { get; set; }
/// <summary>
/// 设备唯一码,IP/MAC/SNO
/// </summary>
public string UniqueNo { get; set; }
/// <summary>
/// 心跳间隔
/// </summary>
public int HeartbeatInterval { get; set; }
/// <summary>
/// 品牌
/// </summary>
public string Brand { get; set; }
/// <summary>
/// 供应商
/// </summary>
public string Supplier { get; set; }
/// <summary>
/// 设备功能 DeviceFuncEnumType
/// </summary>
public List<DeviceFuncEnumType> Funcs
{
public long Id { get; set; }
/// <summary>
/// 设备code
/// </summary>
public Guid Code { get; set; }
/// <summary>
/// 设备唯一码,IP/MAC/SNO
/// </summary>
public string UniqueNo { get; set; }
/// <summary>
/// 心跳间隔
/// </summary>
public int HeartbeatInterval { get; set; }
/// <summary>
/// 品牌
/// </summary>
public string Brand { get; set; }
/// <summary>
/// 供应商
/// </summary>
public string Supplier { get; set; }
/// <summary>
/// 设备功能 DeviceFuncEnumType
/// </summary>
public List<DeviceFuncEnumType> Funcs
get
{
get
{
if (FuncsStr.IsEmpty()) FuncsStr = "[]";
if (FuncsStr.IsEmpty()) FuncsStr = "[]";
return FuncsStr.ToObject<List<DeviceFuncEnumType>>();
}
return FuncsStr.ToObject<List<DeviceFuncEnumType>>();
}
public string FuncsStr { get; set; }
/// <summary>
/// 设备机功能类型
/// </summary>
public DeviceTypeEnumType Type { get; set; }
public string TypeDescription
{
get
{
try
{
return Type.GetDescription();
}
catch (Exception)
{
return string.Empty;
}
}
}
/// <summary>
/// 部署点
/// </summary>
public string DeployPlace { get; set; }
/// <summary>
/// 部署坐标
/// </summary>
public string DeployPosition { get; set; }
/// <summary>
/// 部署方向
/// </summary>
public string DeployDirection { get; set; }
/// <summary>
/// 模板code
/// </summary>
public Guid TemplateCode { get; set; }
/// <summary>
/// 连接信息
/// </summary>
public string ConnectionInfo { get; set; }
/// <summary>
/// 是否启用
/// </summary>
public bool Enable { get; set; }
/// <summary>
/// 是否在线
/// </summary>
public bool IsOnline { get; set; }
/// <summary>
/// 消费总额
/// </summary>
public decimal Amount { get; set; }
/// <summary>
/// 消费人次
/// </summary>
public int UserCount { get; set; }
}
}
public string FuncsStr { get; set; }
/// <summary>
/// 设备机功能类型
/// </summary>
public DeviceTypeEnumType Type { get; set; }
public string TypeDescription
{
get
{
try
{
return Type.GetDescription();
}
catch (Exception)
{
return string.Empty;
}
}
}
/// <summary>
/// 部署点
/// </summary>
public string DeployPlace { get; set; }
/// <summary>
/// 部署坐标
/// </summary>
public string DeployPosition { get; set; }
/// <summary>
/// 部署方向
/// </summary>
public string DeployDirection { get; set; }
/// <summary>
/// 模板code
/// </summary>
public Guid TemplateCode { get; set; }
/// <summary>
/// 连接信息
/// </summary>
public string ConnectionInfo { get; set; }
/// <summary>
/// 是否启用
/// </summary>
public bool Enable { get; set; }
/// <summary>
/// 是否在线
/// </summary>
public bool IsOnline { get; set; }
/// <summary>
/// 消费总额
/// </summary>
public decimal Amount { get; set; }
/// <summary>
/// 消费人次
/// </summary>
public int UserCount { get; set; }
}

3
Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs
View File

@@ -1,5 +1,7 @@
using Dlhis.Entity.Canteen.Enums;
using Kurisu.AspNetCore.Utils.Converters;
using Kurisu.AspNetCore.Utils.Extensions;
using Newtonsoft.Json;
namespace Dlhis.Canteen.Order.Response;
@@ -64,6 +66,7 @@ public class OrderBookingResponse
/// <summary>
/// 订餐日期
/// </summary>
[JsonConverter(typeof(ToDateJsonConverter))]
public DateTime BookingDate { get; set; }
/// <summary>

34
Src/Dlhis.Canteen/Order/Response/OrderDetailResponse.cs
View File

@@ -1,34 +0,0 @@
//namespace Dlhis.Canteen.Order.Response;
//public class OrderDetailResponse
//{
// /// <summary>
// /// 菜品编码
// /// </summary>
// public string DishesCode { get; set; }
// /// <summary>
// /// 菜品名称
// /// </summary>
// public string Name { get; set; }
// /// <summary>
// /// 单价
// /// </summary>
// public decimal Price { get; set; }
// /// <summary>
// /// 数量
// /// </summary>
// public int Number { get; set; }
// /// <summary>
// /// 单位
// /// </summary>
// public string Unit { get; set; }
// /// <summary>
// /// 图片
// /// </summary>
// public string ImageUrl { get; set; }
//}