YD/YD_SmartSports.Api
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s

Browse Source
This commit is contained in:
tanglong 2025-06-09 09:12:29 +08:00
parent c9db953153
commit a85d543c36
2 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
VOL.Business/Services/School/S_SchoolService.cs
View File

@ -60,7 +60,7 @@ namespace VOL.Business.Services.School
var query = from s in _schoolRepository.DbContext.Set<S_School>() var query = from s in _schoolRepository.DbContext.Set<S_School>()
join u in _userRepository.DbContext.Set<Sys_User>() join u in _userRepository.DbContext.Set<Sys_User>()
on s.SchoolCode equals u.SchoolCode on s.SchoolCode equals u.SchoolCode
where u.Role_Id == 2|| u.Role_Id == 4 where u.Role_Id == 2 || u.Role_Id == 4
select new SchoolPageListModel() select new SchoolPageListModel()
{ {
Id = s.Id, Id = s.Id,
@ -78,7 +78,6 @@ namespace VOL.Business.Services.School
SchoolType = s.SchoolType SchoolType = s.SchoolType
}; };
if (!string.IsNullOrWhiteSpace(paramDto.SchoolName)) if (!string.IsNullOrWhiteSpace(paramDto.SchoolName))
{ {
query = query.Where(x => x.SchoolName.Equals(paramDto.SchoolName)); query = query.Where(x => x.SchoolName.Equals(paramDto.SchoolName));
@ -94,7 +93,6 @@ namespace VOL.Business.Services.School
query = query.Where(x => x.UserTrueName.Equals(paramDto.UserTrueName)); query = query.Where(x => x.UserTrueName.Equals(paramDto.UserTrueName));
} }
if (!string.IsNullOrWhiteSpace(paramDto.PhoneNo)) if (!string.IsNullOrWhiteSpace(paramDto.PhoneNo))
{ {
query = query.Where(x => x.PhoneNo.Equals(paramDto.PhoneNo)); query = query.Where(x => x.PhoneNo.Equals(paramDto.PhoneNo));
@ -110,7 +108,6 @@ namespace VOL.Business.Services.School
query = query.Where(x => x.SchoolType == paramDto.SchoolType); query = query.Where(x => x.SchoolType == paramDto.SchoolType);
} }
res.Total = await query.CountAsync(); res.Total = await query.CountAsync();
var list = await query.OrderByDescending(x => x.Id) var list = await query.OrderByDescending(x => x.Id)
@ -139,7 +136,6 @@ namespace VOL.Business.Services.School
school_Entity.CreateDate = DateTime.Now; school_Entity.CreateDate = DateTime.Now;
school_Entity.Creator = UserContext.Current.UserId; school_Entity.Creator = UserContext.Current.UserId;
var gradeEntityList = new List<S_SchoolAssocGrade>(); var gradeEntityList = new List<S_SchoolAssocGrade>();
if (paramDto.SchoolType == SchoolType.School) if (paramDto.SchoolType == SchoolType.School)

39
VOL.WebApi/Dockerfile Normal file
View File

@ -0,0 +1,39 @@
# 请参阅 https://aka.ms/customizecontainer 以了解如何自定义调试容器，以及 Visual Studio 如何使用此 Dockerfile 生成映像以更快地进行调试。
# 此阶段用于在快速模式(默认为调试配置)下从 VS 运行时
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443
# 此阶段用于生成服务项目
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["VOL.WebApi/VOL.WebApi.csproj", "VOL.WebApi/"]
COPY ["VOL.Ai/VOL.Ai.csproj", "VOL.Ai/"]
COPY ["VOL.Business/VOL.Business.csproj", "VOL.Business/"]
COPY ["VOL.Core/VOL.Core.csproj", "VOL.Core/"]
COPY ["VOL.Entity/VOL.Entity.csproj", "VOL.Entity/"]
COPY ["VOL.Model/VOL.Model.csproj", "VOL.Model/"]
COPY ["VOL.System/VOL.System.csproj", "VOL.System/"]
COPY ["VOL.AppManager/VOL.AppManager.csproj", "VOL.AppManager/"]
COPY ["VOL.Builder/VOL.Builder.csproj", "VOL.Builder/"]
COPY ["VOL.IOT/VOL.IOT.csproj", "VOL.IOT/"]
COPY ["VOL.Order/VOL.Order.csproj", "VOL.Order/"]
RUN dotnet restore "./VOL.WebApi/VOL.WebApi.csproj"
COPY . .
WORKDIR "/src/VOL.WebApi"
RUN dotnet build "./VOL.WebApi.csproj" -c $BUILD_CONFIGURATION -o /app/build
# 此阶段用于发布要复制到最终阶段的服务项目
FROM build AS publish
ARG BUILD_CONFIGURATION=Release
RUN dotnet publish "./VOL.WebApi.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
# 此阶段在生产中使用，或在常规模式下从 VS 运行时使用(在不使用调试配置时为默认值)
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "VOL.WebApi.dll"]