diff --git a/Src/Dlhis.Basic.Api/IBusinessPlacePermissionsApi.cs b/Src/Dlhis.Basic.Api/IBusinessPlacePermissionsApi.cs index 68d1aa5d..36c86c74 100644 --- a/Src/Dlhis.Basic.Api/IBusinessPlacePermissionsApi.cs +++ b/Src/Dlhis.Basic.Api/IBusinessPlacePermissionsApi.cs @@ -1,5 +1,4 @@ using Dlhis.Basic.Api.Dto; -using Dlhis.Basic.Api.Request; using Kurisu.RemoteCall.Attributes; using Kurisu.RemoteCall.Default; @@ -11,7 +10,4 @@ public interface IBusinessPlacePermissionsApi [Auth] [Get("/api/businessplacepermissions/my")] Task>> GetMyAsync(); - - [Post("/api/gainfoPermissions/reset")] - Task ResetAsync(GainfoPermissionResetRequest request); } \ No newline at end of file diff --git a/Src/Dlhis.Basic.Api/IGainfoPermissionApi.cs b/Src/Dlhis.Basic.Api/IGainfoPermissionApi.cs new file mode 100644 index 00000000..686ca839 --- /dev/null +++ b/Src/Dlhis.Basic.Api/IGainfoPermissionApi.cs @@ -0,0 +1,12 @@ +using Dlhis.Basic.Api.Request; +using Kurisu.RemoteCall.Attributes; +using Kurisu.RemoteCall.Default; + +namespace Dlhis.Basic.Api; + +[EnableRemoteClient(Name = "basic-service", BaseUrl = "${InternalRequest:BasicRequestUrl}")] +public interface IGainfoPermissionApi +{ + [Post("/api/gainfoPermissions/reset")] + Task ResetAsync(GainfoPermissionResetRequest request); +} \ No newline at end of file diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs index 8dad892a..b90bece8 100644 --- a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs +++ b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs @@ -27,7 +27,7 @@ public class DevicePermissionsController : ControllerBase [HttpPost("assign")] [Transactional] [IgnoreTenant] - public async Task AssignAsync(DevicePermissionSaveReuqest request) + public async Task AssignAsync(DevicePermissionSaveRequest request) { await _devicePermissionService.AssignAsync(request); } diff --git a/Src/Dlhis.Basic/Device/Request/DevicePermissionSaveReuqest.cs b/Src/Dlhis.Basic/Device/Request/DevicePermissionSaveRequest.cs similarity index 96% rename from Src/Dlhis.Basic/Device/Request/DevicePermissionSaveReuqest.cs rename to Src/Dlhis.Basic/Device/Request/DevicePermissionSaveRequest.cs index 85c3a613..6cffd4c8 100644 --- a/Src/Dlhis.Basic/Device/Request/DevicePermissionSaveReuqest.cs +++ b/Src/Dlhis.Basic/Device/Request/DevicePermissionSaveRequest.cs @@ -4,7 +4,7 @@ using Kurisu.AspNetCore.Utils.Extensions; namespace Dlhis.Basic.Device.Request; -public class DevicePermissionSaveReuqest : IValidatableObject +public class DevicePermissionSaveRequest : IValidatableObject { /// /// 分配类型 AssignTypeEnumType diff --git a/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs index 2cf5d7ce..48d44400 100644 --- a/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/IDevicePermissionService.cs @@ -12,7 +12,7 @@ public interface IDevicePermissionService : IScopeDependency /// /// /// - Task AssignAsync(DevicePermissionSaveReuqest reuqest); + Task AssignAsync(DevicePermissionSaveRequest reuqest); /// /// 获取分配的权限 diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs index 7736d3bb..3de9856d 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs @@ -24,7 +24,7 @@ public class DevicePermissionService : IDevicePermissionService _currentUser = currentUser; } - public async Task AssignAsync(DevicePermissionSaveReuqest request) + public async Task AssignAsync(DevicePermissionSaveRequest request) { var tenantId = request.AssignType == AssignTypeEnumType.Department ? request.TenantId : _currentUser.GetStringTenantId(); diff --git a/Src/Dlhis.Basic/Dishes/Response/DishesResponse.cs b/Src/Dlhis.Basic/Dishes/Response/DishesResponse.cs index 8e0f30aa..03f389aa 100644 --- a/Src/Dlhis.Basic/Dishes/Response/DishesResponse.cs +++ b/Src/Dlhis.Basic/Dishes/Response/DishesResponse.cs @@ -45,10 +45,10 @@ public class DishesResponse /// /// 单位 /// - public List Units => CurrnetUnits.ToObject>(); + public List Units => CurrentUnits.ToObject>(); [JsonIgnore] - public string CurrnetUnits { get; set; } + public string CurrentUnits { get; set; } /// /// 图片 diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs index 187f292b..17d54967 100644 --- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs @@ -39,7 +39,7 @@ public class DishesService : IDishesService .Select((x, category) => new DishesResponse { Id = x.Id, - CurrnetUnits = x.Units.ToString(), + CurrentUnits = x.Units.ToString(), CategoryName = category.Name, }, true) .ToPageListAsync(request); diff --git a/Src/Dlhis.Basic/Organization/Response/ChangeCardResponse.cs b/Src/Dlhis.Basic/Organization/Response/ChangeCardResponse.cs index 47943f0e..ce7e57f5 100644 --- a/Src/Dlhis.Basic/Organization/Response/ChangeCardResponse.cs +++ b/Src/Dlhis.Basic/Organization/Response/ChangeCardResponse.cs @@ -12,4 +12,4 @@ public class ChangeCardResponse public string Remark { get; set; } public DateTime CreateTime { get; set; } -} +} \ No newline at end of file diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoCurrentResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoCurrentResponse.cs index 607133fe..2404010f 100644 --- a/Src/Dlhis.Basic/Organization/Response/GainfoCurrentResponse.cs +++ b/Src/Dlhis.Basic/Organization/Response/GainfoCurrentResponse.cs @@ -1,5 +1,7 @@ using Dlhis.Entity.Basic.Enums; +using Kurisu.AspNetCore.Utils.Converters; using Kurisu.AspNetCore.Utils.Extensions; +using Newtonsoft.Json; namespace Dlhis.Basic.Organization.Response; @@ -43,6 +45,7 @@ public class GainfoCurrentResponse /// /// 出生日期/生日 /// + [JsonConverter(typeof(ToDateJsonConverter))] public DateTime Birthday { get; set; } /// diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs index d0abcd62..9c3db6c1 100644 --- a/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs +++ b/Src/Dlhis.Basic/Organization/Response/GainfoDetailResponse.cs @@ -1,5 +1,7 @@ using Dlhis.Entity.Basic.Enums; +using Kurisu.AspNetCore.Utils.Converters; using Kurisu.AspNetCore.Utils.Extensions; +using Newtonsoft.Json; namespace Dlhis.Basic.Organization.Response; @@ -68,6 +70,7 @@ public class GainfoDetailResponse /// /// 出生日期 /// + [JsonConverter(typeof(ToDateJsonConverter))] public DateTime Birthday { get; set; } /// diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoGainfoNumbersResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoGainfoNumbersResponse.cs deleted file mode 100644 index 182a22cb..00000000 --- a/Src/Dlhis.Basic/Organization/Response/GainfoGainfoNumbersResponse.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Dlhis.Basic.Organization.Response -{ - public class GainfoGainfoNumbersResponse - { - public int OnlineNumber { get; set; } - public int OfflineNumber { get; set; } - public int AttendanceNumber{ get; set; } - } -} diff --git a/Src/Dlhis.Basic/Organization/Response/GainfoPageResponse.cs b/Src/Dlhis.Basic/Organization/Response/GainfoPageResponse.cs index a43b0cf8..3de856ad 100644 --- a/Src/Dlhis.Basic/Organization/Response/GainfoPageResponse.cs +++ b/Src/Dlhis.Basic/Organization/Response/GainfoPageResponse.cs @@ -59,11 +59,13 @@ public class GainfoPageResponse /// 性别 /// public GenderEnumType Gender { get; set; } + public string GenderDesc => Gender.GetDescription(); /// /// 生日 /// + [JsonConverter(typeof(ToDateJsonConverter))] public DateTime Birthday { get; set; } /// @@ -116,4 +118,4 @@ public class GainfoPageResponse /// 人事范围 /// public string Werks { get; set; } -} +} \ No newline at end of file diff --git a/Src/Dlhis.Basic/Organization/Response/GetAssignGroupResponse.cs b/Src/Dlhis.Basic/Organization/Response/GetAssignGroupResponse.cs deleted file mode 100644 index eff54888..00000000 --- a/Src/Dlhis.Basic/Organization/Response/GetAssignGroupResponse.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Dlhis.Basic.Organization.Response -{ - public class GetAssignGroupResponse - { - - } -} diff --git a/Src/Dlhis.Basic/Organization/Response/GetDevicesUnderGroupByUserNoResponse.cs b/Src/Dlhis.Basic/Organization/Response/GetDevicesUnderGroupByUserNoResponse.cs index 09ab5aa8..90cabc40 100644 --- a/Src/Dlhis.Basic/Organization/Response/GetDevicesUnderGroupByUserNoResponse.cs +++ b/Src/Dlhis.Basic/Organization/Response/GetDevicesUnderGroupByUserNoResponse.cs @@ -1,10 +1,10 @@ using Dlhis.Basic.Device.Response; -namespace Dlhis.Basic.Organization.Response +namespace Dlhis.Basic.Organization.Response; + +public class GetDevicesUnderGroupByUserNoResponse { - public class GetDevicesUnderGroupByUserNoResponse - { - public Guid GroupCode { get; set; } - public List Devices { get; set; } - } -} + public Guid GroupCode { get; set; } + + public List Devices { get; set; } +} \ No newline at end of file diff --git a/Src/Dlhis.Basic/Organization/Response/GetPlaceByGainfoResponse.cs b/Src/Dlhis.Basic/Organization/Response/GetPlaceByGainfoResponse.cs deleted file mode 100644 index 9d864747..00000000 --- a/Src/Dlhis.Basic/Organization/Response/GetPlaceByGainfoResponse.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Dlhis.Basic.Organization.Response -{ - public class GetPlaceByGainfoResponse - { - public Guid PlaceCode { get; set; } - public string PlaceName { get; set; } - } -} diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordMyResponse.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordMyResponse.cs index b3de406c..b43de229 100644 --- a/Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordMyResponse.cs +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordMyResponse.cs @@ -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 /// /// 餐补日期 /// + [JsonConverter(typeof(ToDateJsonConverter))] public DateTime Date { get; set; } [JsonIgnore] diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordResponse.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordResponse.cs index 01d8baf3..f0c4ef9d 100644 --- a/Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordResponse.cs +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordResponse.cs @@ -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 /// /// 考勤日期 /// + [JsonConverter(typeof(ToDateJsonConverter))] public DateTime Date { get; set; } /// diff --git a/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs b/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs index ee13e8a9..44eca76f 100644 --- a/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs +++ b/Src/Dlhis.Canteen/Order/Controllers/OrdersController.cs @@ -28,7 +28,7 @@ public class OrdersController : ControllerBase } /// - /// 添加充值/消费订单 + /// 添加充值 /// /// /// diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs deleted file mode 100644 index 26ab163f..00000000 --- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordByUserResponse.cs +++ /dev/null @@ -1,62 +0,0 @@ -using Dlhis.Entity.Canteen.Enums; -using Kurisu.AspNetCore.Utils.Extensions; - -namespace Dlhis.Canteen.Order.Response; - -public class BalanceRecordByUserResponse -{ - /// - /// 流水号 - /// - public string No { get; set; } - - /// - /// 金额 - /// - public string Name { get; set; } - - /// - /// 学工号 - /// - public string UserCode { get; set; } - - /// - /// 部门号 - /// - public string DepartmentNo { get; set; } - - /// - /// 来源 - /// - public BalanceRecordSourceEnumType Source { get; set; } - - /// - /// 来源CN - /// - public string SourceCN => Source.GetDescription(); - - /// - /// 收入/支出 - /// - public BalanceRecordTypeEnumType Type { get; set; } - - /// - /// 收入/支出 - /// - public string TypeCN => Type.GetDescription(); - - /// - /// 金额 + - 表示 - /// - public decimal Amount { get; set; } - - /// - /// 消费时间 - /// - public DateTime CostDateTime { get; set; } - - /// - /// 备注 - /// - public string Remark { get; set; } -} diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordCostIdResponse.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordCostIdResponse.cs deleted file mode 100644 index 0823b9a7..00000000 --- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordCostIdResponse.cs +++ /dev/null @@ -1,94 +0,0 @@ -namespace Dlhis.Canteen.Order.Response -{ - public class BalanceRecordCostIdResponse - { - /// - /// 成本中心 - /// - public string CostId { get; set; } - - /// - /// 早餐人数 - /// - - public int BreakfastNumberOfPeople { get; set; } - - /// - /// 早餐单价price - /// - - public decimal BreakfastPrice { get; set; } - - /// - /// 早餐金额 - /// - - public decimal BreakfastAmount { get; set; } - - /// - /// 午餐人数 - /// - - public int LunchNumberOfPeople { get; set; } - - /// - /// 午餐单价price - /// - - public decimal LunchPrice { get; set; } - - /// - /// 午餐金额 - /// - - public decimal LunchAmount { get; set; } - - /// - /// 晚餐人数 - /// - - public int DinnerNumberOfPeople { get; set; } - - /// - /// 晚餐单价price - /// - - public decimal DinnerPrice { get; set; } - - /// - /// 晚餐金额 - /// - - public decimal DinnerAmount { get; set; } - - /// - /// 宵夜人数 - /// - - public int LateNightNumberOfPeople { get; set; } - - /// - /// 宵夜单价price - /// - - public decimal LateNightPrice { get; set; } - - /// - /// 宵夜金额 - /// - - public decimal LateNightAmount { get; set; } - - /// - /// 总金额 - /// - - public decimal TotalAmount { get; set; } - - /// - /// 总人数 - /// - - public int TotalNumberOfPeople { get; set; } - } -} diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordDeviceResponse.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordDeviceResponse.cs index d7035b3b..9f8d423b 100644 --- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordDeviceResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordDeviceResponse.cs @@ -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 /// /// 所属成本日期 /// + [JsonConverter(typeof(ToDateJsonConverter))] public DateTime CostDate { get; set; } /// @@ -99,9 +102,3 @@ public class BalanceRecordDeviceResponse /// public string TenantName { get; set; } } - - -public class BalanceRecordDeviceItemResponse -{ - -} diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs index fef548a8..ac4c6183 100644 --- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs @@ -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 /// /// 所属成本日期 /// + [JsonConverter(typeof(ToDateJsonConverter))] public DateTime CostDate { get; set; } /// @@ -57,12 +60,14 @@ public class BalanceRecordResponse /// 来源 /// public BalanceRecordSourceEnumType Source { get; set; } + public string SourceDesc => Source.GetDescription(); /// /// 收入/支出 /// public BalanceRecordTypeEnumType Type { get; set; } + public string TypeDesc => Type.GetDescription(); /// @@ -79,6 +84,7 @@ public class BalanceRecordResponse /// 餐次 /// public ShiftEnumType? ShiftType { get; set; } + /// /// 餐次 /// @@ -123,4 +129,4 @@ public class BalanceRecordResponse /// 人事范围 /// public string Werks { get; set; } -} +} \ No newline at end of file diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordSummaryRespones.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordSummaryRespones.cs deleted file mode 100644 index f6208b72..00000000 --- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordSummaryRespones.cs +++ /dev/null @@ -1,113 +0,0 @@ -using SqlSugar; - -namespace Dlhis.Canteen.Order.Response -{ - public class BalanceRecordSummaryRespones - { - /// - /// 部门号 - /// - public string DepartmentNo { get; set; } - - /// - /// 部门名称 - /// - public string DepartmentName { get; set; } - - /// - /// 成本中心 - /// - public string CostId { get; set; } - - /// - /// 消费者所在基地 - /// - public string OriginTenantId { get; set; } - - /// - /// 早餐人数 - /// - - public int BreakfastNumberOfPeople { get; set; } - - /// - /// 早餐单价price - /// - - public decimal BreakfastPrice { get; set; } - - /// - /// 早餐金额 - /// - - public decimal BreakfastAmount { get; set; } - - /// - /// 午餐人数 - /// - - public int LunchNumberOfPeople { get; set; } - - /// - /// 午餐单价price - /// - - public decimal LunchPrice { get; set; } - - /// - /// 午餐金额 - /// - - public decimal LunchAmount { get; set; } - - /// - /// 晚餐人数 - /// - - public int DinnerNumberOfPeople { get; set; } - - /// - /// 晚餐单价price - /// - - public decimal DinnerPrice { get; set; } - - /// - /// 晚餐金额 - /// - - public decimal DinnerAmount { get; set; } - - /// - /// 宵夜人数 - /// - - public int LateNightNumberOfPeople { get; set; } - - /// - /// 宵夜单价price - /// - - public decimal LateNightPrice { get; set; } - - /// - /// 宵夜金额 - /// - - public decimal LateNightAmount { get; set; } - - /// - /// 总金额 - /// - - public decimal TotalAmount { get; set; } - - /// - /// 总人数 - /// - - public int TotalNumberOfPeople { get; set; } - - - } -} diff --git a/Src/Dlhis.Canteen/Order/Response/ConsumeNumberResponse.cs b/Src/Dlhis.Canteen/Order/Response/ConsumeNumberResponse.cs index 130bd99b..7642fe08 100644 --- a/Src/Dlhis.Canteen/Order/Response/ConsumeNumberResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/ConsumeNumberResponse.cs @@ -1,40 +1,39 @@ -namespace Dlhis.Canteen.Order.Response +namespace Dlhis.Canteen.Order.Response; + +public class ConsumeNumberResponse { - public class ConsumeNumberResponse - { - /// - /// 消费机总数 - /// - public int Total { get; set; } + /// + /// 消费机总数 + /// + public int Total { get; set; } - /// - /// 消费机离线数 - /// - public int OffNumber { get; set; } + /// + /// 消费机离线数 + /// + public int OffNumber { get; set; } - /// - /// 营业点总数 - /// - public int PlaceNumber { get; set; } + /// + /// 营业点总数 + /// + public int PlaceNumber { get; set; } - /// - /// 可消费人数 - /// - public int ConsumerableNumber { get; set; } + /// + /// 可消费人数 + /// + public int ConsumerableNumber { get; set; } - /// - /// 人均日消费额 - /// - public int DailyNumber { get; set; } + /// + /// 人均日消费额 + /// + public int DailyNumber { get; set; } - /// - /// 日消费额走势图 - /// - public List Days { get; set; } + /// + /// 日消费额走势图 + /// + public List Days { get; set; } - /// - /// 月消费额走势图 - /// - public List Months { get; set; } - } -} + /// + /// 月消费额走势图 + /// + public List Months { get; set; } +} \ No newline at end of file diff --git a/Src/Dlhis.Canteen/Order/Response/ConsumptionTrendResponse.cs b/Src/Dlhis.Canteen/Order/Response/ConsumptionTrendResponse.cs index b490dd19..6d31c2ff 100644 --- a/Src/Dlhis.Canteen/Order/Response/ConsumptionTrendResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/ConsumptionTrendResponse.cs @@ -1,20 +1,19 @@ -namespace Dlhis.Canteen.Order.Response +namespace Dlhis.Canteen.Order.Response; + +public class ConsumptionTrendResponse { - public class ConsumptionTrendResponse - { - /// - /// 时间 - /// - public string DateTime { get; set; } + /// + /// 时间 + /// + public string DateTime { get; set; } - /// - /// 当日/月消费总额 - /// - public decimal CurrentAmount { get; set; } + /// + /// 当日/月消费总额 + /// + public decimal CurrentAmount { get; set; } - /// - /// 消费总额 - /// - public decimal TotalAmount { get; set; } - } -} + /// + /// 消费总额 + /// + public decimal TotalAmount { get; set; } +} \ No newline at end of file diff --git a/Src/Dlhis.Canteen/Order/Response/DevicePageResponseResponse.cs b/Src/Dlhis.Canteen/Order/Response/DevicePageResponseResponse.cs index 43558462..338a9ba8 100644 --- a/Src/Dlhis.Canteen/Order/Response/DevicePageResponseResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/DevicePageResponseResponse.cs @@ -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; } + + /// + /// 设备code + /// + public Guid Code { get; set; } + + /// + /// 设备唯一码,IP/MAC/SNO + /// + public string UniqueNo { get; set; } + + /// + /// 心跳间隔 + /// + public int HeartbeatInterval { get; set; } + + /// + /// 品牌 + /// + public string Brand { get; set; } + + /// + /// 供应商 + /// + public string Supplier { get; set; } + + /// + /// 设备功能 DeviceFuncEnumType + /// + public List Funcs { - public long Id { get; set; } - - /// - /// 设备code - /// - public Guid Code { get; set; } - - /// - /// 设备唯一码,IP/MAC/SNO - /// - public string UniqueNo { get; set; } - - /// - /// 心跳间隔 - /// - public int HeartbeatInterval { get; set; } - - /// - /// 品牌 - /// - public string Brand { get; set; } - - /// - /// 供应商 - /// - public string Supplier { get; set; } - - /// - /// 设备功能 DeviceFuncEnumType - /// - public List Funcs + get { - get - { - if (FuncsStr.IsEmpty()) FuncsStr = "[]"; + if (FuncsStr.IsEmpty()) FuncsStr = "[]"; - return FuncsStr.ToObject>(); - } + return FuncsStr.ToObject>(); } - - public string FuncsStr { get; set; } - - /// - /// 设备机功能类型 - /// - public DeviceTypeEnumType Type { get; set; } - - public string TypeDescription - { - get - { - try - { - return Type.GetDescription(); - } - catch (Exception) - { - return string.Empty; - } - } - } - - /// - /// 部署点 - /// - public string DeployPlace { get; set; } - - /// - /// 部署坐标 - /// - public string DeployPosition { get; set; } - - /// - /// 部署方向 - /// - public string DeployDirection { get; set; } - - /// - /// 模板code - /// - public Guid TemplateCode { get; set; } - - /// - /// 连接信息 - /// - public string ConnectionInfo { get; set; } - - - /// - /// 是否启用 - /// - public bool Enable { get; set; } - - /// - /// 是否在线 - /// - public bool IsOnline { get; set; } - - /// - /// 消费总额 - /// - public decimal Amount { get; set; } - - /// - /// 消费人次 - /// - public int UserCount { get; set; } - } -} + + public string FuncsStr { get; set; } + + /// + /// 设备机功能类型 + /// + public DeviceTypeEnumType Type { get; set; } + + public string TypeDescription + { + get + { + try + { + return Type.GetDescription(); + } + catch (Exception) + { + return string.Empty; + } + } + } + + /// + /// 部署点 + /// + public string DeployPlace { get; set; } + + /// + /// 部署坐标 + /// + public string DeployPosition { get; set; } + + /// + /// 部署方向 + /// + public string DeployDirection { get; set; } + + /// + /// 模板code + /// + public Guid TemplateCode { get; set; } + + /// + /// 连接信息 + /// + public string ConnectionInfo { get; set; } + + + /// + /// 是否启用 + /// + public bool Enable { get; set; } + + /// + /// 是否在线 + /// + public bool IsOnline { get; set; } + + /// + /// 消费总额 + /// + public decimal Amount { get; set; } + + /// + /// 消费人次 + /// + public int UserCount { get; set; } +} \ No newline at end of file diff --git a/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs b/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs index f6ee796e..7c096540 100644 --- a/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs @@ -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 /// /// 订餐日期 /// + [JsonConverter(typeof(ToDateJsonConverter))] public DateTime BookingDate { get; set; } /// diff --git a/Src/Dlhis.Canteen/Order/Response/OrderDetailResponse.cs b/Src/Dlhis.Canteen/Order/Response/OrderDetailResponse.cs deleted file mode 100644 index f0af992a..00000000 --- a/Src/Dlhis.Canteen/Order/Response/OrderDetailResponse.cs +++ /dev/null @@ -1,34 +0,0 @@ -//namespace Dlhis.Canteen.Order.Response; - -//public class OrderDetailResponse -//{ -// /// -// /// 菜品编码 -// /// -// public string DishesCode { get; set; } - -// /// -// /// 菜品名称 -// /// -// public string Name { get; set; } - -// /// -// /// 单价 -// /// -// public decimal Price { get; set; } - -// /// -// /// 数量 -// /// -// public int Number { get; set; } - -// /// -// /// 单位 -// /// -// public string Unit { get; set; } - -// /// -// /// 图片 -// /// -// public string ImageUrl { get; set; } -//} diff --git a/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs b/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs index 6443f7f6..bf3bcb54 100644 --- a/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs +++ b/Src/Dlhis.ScheduledTask/Common/Services/Implements/GainfoUpdateService.cs @@ -17,7 +17,7 @@ public class GainfoUpdateService : IGainfoUpdateService private readonly IDbContext _dbContext; private readonly ILogger _logger; private readonly ITenantApi _tenantApi; - private readonly IBusinessPlacePermissionsApi _businessPlacePermissionsApi; + private readonly IGainfoPermissionApi _gainfoPermissionApi; private readonly IDevicePermissionApi _devicePermissionApi; private readonly IJinkoSapService _jinkoSapService; @@ -28,7 +28,7 @@ public class GainfoUpdateService : IGainfoUpdateService public GainfoUpdateService(IDbContext dbContext, ILogger logger, ITenantApi tenantApi, - IBusinessPlacePermissionsApi businessPlacePermissionsApi, + IGainfoPermissionApi gainfoPermissionApi, IDevicePermissionApi devicePermissionApi, IJinkoSapService jinkoSapService) { @@ -36,7 +36,7 @@ public class GainfoUpdateService : IGainfoUpdateService _dbContext.Client.QueryFilter.Clear(); _logger = logger; _tenantApi = tenantApi; - _businessPlacePermissionsApi = businessPlacePermissionsApi; + _gainfoPermissionApi = gainfoPermissionApi; _devicePermissionApi = devicePermissionApi; _jinkoSapService = jinkoSapService; } @@ -156,8 +156,6 @@ public class GainfoUpdateService : IGainfoUpdateService var existsUpdateWorkCodes = originUpdates.Select(x => x.ZWORKCODE).ToList(); var originInserts = persons.Where(x => searchCodes.Contains(x.ZWORKCODE)).Where(x => !existsUpdateWorkCodes.Contains(x.ZWORKCODE)).ToList(); - int i = 0; - var updates = ToGainfoSap(originUpdates); _logger.LogWarning("SAP分批更新数:{count}", updates.Count); var inserts = ToGainfoSap(originInserts); @@ -165,7 +163,6 @@ public class GainfoUpdateService : IGainfoUpdateService foreach (var item in inserts) { - i++; try { var no = await InsertPersonAsync(item); @@ -179,7 +176,6 @@ public class GainfoUpdateService : IGainfoUpdateService foreach (var item in updates) { - i++; try { var no = await _dbContext.Queryable().Where(x => x.Code == item.ename).Select(x => x.No).SingleAsync(); @@ -200,7 +196,7 @@ public class GainfoUpdateService : IGainfoUpdateService { no = await UpdatePersonAsync(item); _logger.LogWarning("执行更新成功 工号:{code},姓名:{name}", item.ename, item.gname); - await _businessPlacePermissionsApi.ResetAsync(new GainfoPermissionResetRequest + await _gainfoPermissionApi.ResetAsync(new GainfoPermissionResetRequest { UserNo = no }); @@ -351,7 +347,7 @@ public class GainfoUpdateService : IGainfoUpdateService { try { - await _businessPlacePermissionsApi.ResetAsync(new GainfoPermissionResetRequest + await _gainfoPermissionApi.ResetAsync(new GainfoPermissionResetRequest { IsLeave = true, UserNo = gainfo.No @@ -468,79 +464,71 @@ public class GainfoUpdateService : IGainfoUpdateService { return data.Select(person => { - GainfoSapEntity o = null; - try + //var position = _positions.FirstOrDefault(x => x.No == person.PLANS); + + var rzrq = person.ZRZRQ; + var lzrq = person.ZLZRQ; + var rmk = $"入职时间:{rzrq.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)} "; + + if (lzrq != null && lzrq.Value.ToString("yyyy-MM-dd") != "1900-01-01") + rmk += $"离职时间:{lzrq.Value.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)} "; + + if (!string.IsNullOrWhiteSpace(person.MGTXT)) + rmk += $"变更原因:{person.MGTXT}"; + + var native = GetNative(person.ZZ_SFZH); + var sex = person.GESCH == "2" ? "F" : "M"; + + person.ZZ_SFZH = person.ZZ_SFZH?.TrimStart(); + GainfoSapEntity o = new() { - //var position = _positions.FirstOrDefault(x => x.No == person.PLANS); + gname = person.NAME, + ename = person.ZWORKCODE, + idno = person.ZZ_SFZH, + birthday = person.GBDAT, + ZZ_KLX = person.ZZ_KLX, + email = person.ZXUELI, + appellation = person.ORGEH, + phone = person.ZMOBILE, + ZSTATUS = person.ZSTATUS, + createdate = person.ZRZRQ, + PERNR = person.PERNR, + WERKS = person.WERKS, + KOSTL = person.KOSTL, + ZZ_ZD = person.ZZ_ZD, + Z_ZJ = person.Z_ZJ, + STELL = person.STELL, + STELL_NM = person.STELL_NM, + ZLZRQ = person.ZLZRQ, + MASSN = person.MASSN, + MNTXT = person.MNTXT, + remark = rmk, + native = native, + sex = sex, + logdate = DateTime.Now, + isowner = int.Parse(person.ZSTATUS) < 5 ? "T" : "F", + @class = "C", + country = person.ZZ_COUNNM, + log_ip = "127.0.0.1", + log_shift = "1", + log_id = "XX", + address = "", + occupation = "99", + nation = "01", + idcls = "ID", + ZZ_COUNNM = person.ZZ_COUNNM, + ZZ_GZDJDNM = person.ZZ_GZDJDNM, + ZZ_GZDCQNM = person.ZZ_GZDCQNM, + }; - var rzrq = person.ZRZRQ; - var lzrq = person.ZLZRQ; - var rmk = $"入职时间:{rzrq.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)} "; - - if (lzrq != null && lzrq.Value.ToString("yyyy-MM-dd") != "1900-01-01") - rmk += $"离职时间:{lzrq.Value.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)} "; - - if (!string.IsNullOrWhiteSpace(person.MGTXT)) - rmk += $"变更原因:{person.MGTXT}"; - - var native = GetNative(person.ZZ_SFZH); - var sex = person.GESCH == "2" ? "F" : "M"; - - person.ZZ_SFZH = person.ZZ_SFZH?.TrimStart(); - o = new GainfoSapEntity - { - gname = person.NAME, - ename = person.ZWORKCODE, - idno = person.ZZ_SFZH, - birthday = person.GBDAT, - ZZ_KLX = person.ZZ_KLX, - email = person.ZXUELI, - appellation = person.ORGEH, - phone = person.ZMOBILE, - ZSTATUS = person.ZSTATUS, - createdate = person.ZRZRQ, - PERNR = person.PERNR, - WERKS = person.WERKS, - KOSTL = person.KOSTL, - ZZ_ZD = person.ZZ_ZD, - Z_ZJ = person.Z_ZJ, - STELL = person.STELL, - STELL_NM = person.STELL_NM, - ZLZRQ = person.ZLZRQ, - MASSN = person.MASSN, - MNTXT = person.MNTXT, - remark = rmk, - native = native, - sex = sex, - logdate = DateTime.Now, - isowner = int.Parse(person.ZSTATUS) < 5 ? "T" : "F", - @class = "C", - country = person.ZZ_COUNNM, - log_ip = "127.0.0.1", - log_shift = "1", - log_id = "XX", - address = "", - occupation = "99", - nation = "01", - idcls = "ID", - ZZ_COUNNM = person.ZZ_COUNNM, - ZZ_GZDJDNM = person.ZZ_GZDJDNM, - ZZ_GZDCQNM = person.ZZ_GZDCQNM, - }; - - return o; - } - catch (Exception) - { - throw; - } + return o; }).ToList(); } - private static string GetNative(string idno) + private static string GetNative(string idNo) { - if (string.IsNullOrWhiteSpace(idno) || idno.Length < 6) return null; - idno = idno.TrimStart(); - return idno[..6]; + if (string.IsNullOrWhiteSpace(idNo) || idNo.Length < 6) return null; + idNo = idNo.TrimStart(); + return idNo[..6]; } } \ No newline at end of file