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

feat 外包人员,框架升级

Browse Source
This commit is contained in:
liguoyang
2024-05-30 19:37:27 +08:00
parent 5a437af90b
commit 75bd31d4a5
298 changed files with 2124 additions and 2313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Dlhis.Basic/Dishes/Controller/DishesMenusController.cs
View File

@@ -3,8 +3,8 @@ using Dlhis.Basic.Dishes.Request;
using Dlhis.Basic.Dishes.Response;
using Dlhis.Basic.Dishes.Services;
using Dlhis.Entity.Canteen.Enums;
using Kurisu.AspNetCore.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
using Kurisu.Core.DataAccess.Dto;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@@ -33,7 +33,7 @@ public class DishesMenusController : ControllerBase
/// <param name="request"></param>
/// <returns></returns>
[HttpGet("page")]
public async Task<Pagination<DishesMenuPageResponse>> GetDishesMenuPageAsync([FromQuery] DisheMenuPageRequest request)
public async Task<Pagination<DishesMenuPageResponse>> GetDishesMenuPageAsync([FromQuery] DishesMenuPageRequest request)
{
return await _dishesMenuService.GetDishesMenuPageAsync(request);
}

2
Src/Dlhis.Basic/Dishes/Request/DishesMenuNameDateSaveRequest.cs
View File

@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
using Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.CustomClass;
namespace Dlhis.Basic.Dishes.Request;

4
Src/Dlhis.Basic/Dishes/Request/DisheMenuPageRequest.cs → Src/Dlhis.Basic/Dishes/Request/DishesMenuPageRequest.cs
View File

@@ -1,9 +1,9 @@
using System.ComponentModel.DataAnnotations;
using Kurisu.Core.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Basic.Dishes.Request;
public class DisheMenuPageRequest : PageDto
public class DishesMenuPageRequest : PageDto
{
/// <summary>
/// 营业点code

2
Src/Dlhis.Basic/Dishes/Request/DishesPageRequest.cs
View File

@@ -1,4 +1,4 @@
using Kurisu.Core.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Basic.Dishes.Request;

4
Src/Dlhis.Basic/Dishes/Services/IDishesMenuService.cs
View File

@@ -1,14 +1,14 @@
using Dlhis.Entity.Canteen.Enums;
using Kurisu.Core.DataAccess.Dto;
using Dlhis.Basic.Dishes.Request;
using Dlhis.Basic.Dishes.Dto;
using Dlhis.Basic.Dishes.Response;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Basic.Dishes.Services;
public interface IDishesMenuService : IScopeDependency
{
Task<Pagination<DishesMenuPageResponse>> GetDishesMenuPageAsync(DisheMenuPageRequest request);
Task<Pagination<DishesMenuPageResponse>> GetDishesMenuPageAsync(DishesMenuPageRequest request);
Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime startDate, DateTime endDate);

2
Src/Dlhis.Basic/Dishes/Services/IDishesService.cs
View File

@@ -1,6 +1,6 @@
using Dlhis.Basic.Dishes.Request;
using Dlhis.Basic.Dishes.Response;
using Kurisu.Core.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.Basic.Dishes.Services;

6
Src/Dlhis.Basic/Dishes/Services/Implements/DishesCategoryService.cs
View File

@@ -1,10 +1,10 @@
using Dlhis.Basic.BusinessPlace.Services;
using Dlhis.Basic.Dishes.Request;
using Dlhis.Basic.Dishes.Request;
using Dlhis.Basic.Dishes.Response;
using Dlhis.Basic.Places.Services;
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Canteen.Entities;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.SqlSugar.Services;
using Mapster;
namespace Dlhis.Basic.Dishes.Services.Implements;

73
Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs
View File

@@ -1,16 +1,16 @@
using Dlhis.Entity.Canteen.Entities;
using Dlhis.Entity.Canteen.Enums;
using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.DataAccess.Dto;
using Kurisu.SqlSugar.Extensions;
using Kurisu.SqlSugar.Services;
using SqlSugar;
using Dlhis.Basic.Dishes.Request;
using Dlhis.Basic.Dishes.Response;
using Dlhis.Basic.BusinessPlace.Services;
using Dlhis.Basic.Dishes.Dto;
using Kurisu.Core.CustomClass;
using System.Linq.Expressions;
using Dlhis.Basic.Places.Services;
using Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
namespace Dlhis.Basic.Dishes.Services.Implements;
@@ -25,7 +25,7 @@ public class DishesMenuService : IDishesMenuService
_businessPlacePermissionsService = businessPlacePermissionsService;
}
public async Task<Pagination<DishesMenuPageResponse>> GetDishesMenuPageAsync(DisheMenuPageRequest request)
public async Task<Pagination<DishesMenuPageResponse>> GetDishesMenuPageAsync(DishesMenuPageRequest request)
{
return await _dbContext.Queryable<DishesMenuEntity>()
.Where(x => x.BusinessPlaceCode == request.BusinessPlaceCode)
@@ -43,11 +43,11 @@ public class DishesMenuService : IDishesMenuService
public async Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime startDate, DateTime endDate)
{
var data = await _dbContext.Queryable<DishesMenuEntity>()
.Where(x => x.BusinessPlaceCode == businessPlaceCode)
.Where(x => x.CustomCode == customCode)
.Where(x => x.StartDate == startDate)
.Where(x => x.EndDate == endDate)
.ToListAsync();
.Where(x => x.BusinessPlaceCode == businessPlaceCode)
.Where(x => x.CustomCode == customCode)
.Where(x => x.StartDate == startDate)
.Where(x => x.EndDate == endDate)
.ToListAsync();
if (data.IsEmpty())
{
@@ -71,7 +71,7 @@ public class DishesMenuService : IDishesMenuService
Start = data[0].StartDate,
End = data[0].EndDate,
},
ShiftTypes = data.GroupBy(x => x.ShiftType).Select(item =>
ShiftTypes = data.GroupBy(x => x.ShiftType).Select(item =>
{
var shiftType = item.Key;
@@ -85,7 +85,6 @@ public class DishesMenuService : IDishesMenuService
Price = x.Price,
}).ToList()
};
}).ToList()
}
}
@@ -168,10 +167,10 @@ public class DishesMenuService : IDishesMenuService
keys.ForEach(x =>
{
deleteWhere = deleteWhere.Or(item => item.BusinessPlaceCode == request.BusinessPlaceCode
&& item.CustomCode == x.CustomCode
//&& SqlFunc.DateIsSame(item.StartDate, x.StartDate, DateType.Day)
//&& SqlFunc.DateIsSame(item.EndDate, x.EndDate, DateType.Day)
&& item.ShiftType == x.ShiftType);
&& item.CustomCode == x.CustomCode
//&& SqlFunc.DateIsSame(item.StartDate, x.StartDate, DateType.Day)
//&& SqlFunc.DateIsSame(item.EndDate, x.EndDate, DateType.Day)
&& item.ShiftType == x.ShiftType);
});
await _dbContext.Client.Deleteable<DishesMenuEntity>().Where(deleteWhere).ExecuteCommandAsync();
@@ -182,7 +181,7 @@ public class DishesMenuService : IDishesMenuService
request.Items.ForEach(p =>
{
whereCheck = whereCheck.Or(x => x.BusinessPlaceCode == request.BusinessPlaceCode
&& !(x.EndDate < p.Period.Start || x.StartDate > p.Period.End)
&& !(x.EndDate < p.Period.Start || x.StartDate > p.Period.End)
);
});
@@ -196,24 +195,24 @@ public class DishesMenuService : IDishesMenuService
public async Task<DishesMenuDetailDto> GetBookingDishesDetailAsync(DateTime date, Guid businessPlaceCode, ShiftEnumType shiftType, string dishesCode)
{
var detail = await _dbContext.Queryable<DishesMenuEntity>()
.LeftJoin<DishesEntity>((x, d) => x.DishesCode == d.CustomCode)
.Where(x => x.StartDate <= date && date <= x.EndDate)
.Where(x => x.BusinessPlaceCode == businessPlaceCode)
.Where(x => x.ShiftType == shiftType)
.Where(x => x.DishesCode == dishesCode)
.Where((x, d) => d.Enable)
.Select((x, d) => new DishesMenuDetailDto
{
Date = date,
MenuId = x.Id,
DishesId = d.Id,
DishesCode = d.CustomCode,
DishesName = d.Name,
Price = x.Price == null || x.Price == 0 ? d.Price : x.Price.Value,
Number = x.Number,
Version = x.Version,
})
.SingleAsync();
.LeftJoin<DishesEntity>((x, d) => x.DishesCode == d.CustomCode)
.Where(x => x.StartDate <= date && date <= x.EndDate)
.Where(x => x.BusinessPlaceCode == businessPlaceCode)
.Where(x => x.ShiftType == shiftType)
.Where(x => x.DishesCode == dishesCode)
.Where((x, d) => d.Enable)
.Select((x, d) => new DishesMenuDetailDto
{
Date = date,
MenuId = x.Id,
DishesId = d.Id,
DishesCode = d.CustomCode,
DishesName = d.Name,
Price = x.Price == null || x.Price == 0 ? d.Price : x.Price.Value,
Number = x.Number,
Version = x.Version,
})
.SingleAsync();
return detail;
}
@@ -237,4 +236,4 @@ public class DishesMenuService : IDishesMenuService
}
}
}
}
}

49
Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs
View File

@@ -1,14 +1,14 @@
using Dlhis.Basic.BusinessPlace.Services;
using Dlhis.Basic.Dishes.Request;
using Dlhis.Basic.Dishes.Request;
using Dlhis.Basic.Dishes.Response;
using Dlhis.Basic.Places.Services;
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Canteen.Entities;
using Dlhis.Entity.Canteen.Enums;
using Kurisu.AspNetCore.Authentication.Abstractions;
using Kurisu.AspNetCore.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.DataAccess.Dto;
using Kurisu.Core.User.Abstractions;
using Kurisu.SqlSugar.Extensions;
using Kurisu.SqlSugar.Services;
using Mapster;
namespace Dlhis.Basic.Dishes.Services.Implements;
@@ -31,19 +31,18 @@ public class DishesService : IDishesService
var myCodes = await GetMyBusinessPlaceCodesAsync();
return await _dbContext.Queryable<DishesEntity>()
.LeftJoin<DishesCategoryEntity>((x, category) => x.CategoryCode == category.Code)
.WhereIF(request.Search.IsPresent(), x => x.CustomCode == request.Search || x.Name.Contains(request.Search))
.WhereIF(request.BusinessPlaceCodes.IsPresent(), x => request.BusinessPlaceCodes.Contains(x.BusinessPlaceCode))
.Where(x => myCodes.Contains(x.BusinessPlaceCode))
.OrderBy(x => x.CreateTime, SqlSugar.OrderByType.Desc)
.Select((x, category) => new DishesResponse
{
Id = x.Id,
CurrnetUnits = x.Units.ToString(),
CategoryName = category.Name,
}, true)
.ToPageListAsync(request);
.LeftJoin<DishesCategoryEntity>((x, category) => x.CategoryCode == category.Code)
.WhereIF(request.Search.IsPresent(), x => x.CustomCode == request.Search || x.Name.Contains(request.Search))
.WhereIF(request.BusinessPlaceCodes.IsPresent(), x => request.BusinessPlaceCodes.Contains(x.BusinessPlaceCode))
.Where(x => myCodes.Contains(x.BusinessPlaceCode))
.OrderBy(x => x.CreateTime, SqlSugar.OrderByType.Desc)
.Select((x, category) => new DishesResponse
{
Id = x.Id,
CurrnetUnits = x.Units.ToString(),
CategoryName = category.Name,
}, true)
.ToPageListAsync(request);
}
@@ -85,13 +84,12 @@ public class DishesService : IDishesService
deadline = new TimeOnly(8, 30);
var payTypes = new List<BalanceRecordSourceEnumDto>() { new() { Type = BalanceRecordSourceEnumType.Cash } };
var selectTenantId = await _dbContext.Queryable<BusinessPlaceEntity>()
.Where(x => x.Code == request.BusinessPlaceCode)
.Select(x => x.TenantId)
.FirstAsync();
.Where(x => x.Code == request.BusinessPlaceCode)
.Select(x => x.TenantId)
.FirstAsync();
if (gainfo.Factory == selectTenantId)
{
@@ -115,8 +113,6 @@ public class DishesService : IDishesService
}
/// <summary>
/// 获取我的营业点
/// </summary>
@@ -125,5 +121,4 @@ public class DishesService : IDishesService
{
return (await _businessPlacePermissionsService.GetMyAsync()).Select(x => x.Code).ToList();
}
}
}