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

fix userId --> userNo

Browse Source
This commit is contained in:
liguoyang
2024-01-11 16:37:17 +08:00
parent 5d1b3ad0f7
commit e03cb26174
6 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dlis.Jinko.Yikatong.sln
View File

@@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Sys", "Src\Dlhis.Sys\
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Canteen", "Src\Dlhis.Canteen\Dlhis.Canteen.csproj", "{8317C526-3523-4195-9B19-2F17CFD71927}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.Canteen", "Src\Dlhis.Canteen\Dlhis.Canteen.csproj", "{8317C526-3523-4195-9B19-2F17CFD71927}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dlhis.User.Api", "Src\Dlhis.User.Api\Dlhis.User.Api.csproj", "{F294CD7D-0412-48AD-A7E9-E72B9BA0E48E}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dlhis.User.Api", "Src\Dlhis.User.Api\Dlhis.User.Api.csproj", "{F294CD7D-0412-48AD-A7E9-E72B9BA0E48E}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

2
Src/Dlhis.Basic/MealUser/Services/IMealUserService.cs
View File

@@ -9,6 +9,4 @@ public interface IMealUserService : IScopeDependency
Task<Pagination<MealUserResponse>> GetPageAsync(MealUserPageRequest request); Task<Pagination<MealUserResponse>> GetPageAsync(MealUserPageRequest request);
Task AddAsync(MealUserAddRequest request); Task AddAsync(MealUserAddRequest request);
Task<MealUserResponse> GetMealUserAsync(string uniqueId);
} }

8
Src/Dlhis.Basic/MealUser/Services/Implements/MealUserService.cs
View File

@@ -53,12 +53,4 @@ public class MealUserService : IMealUserService
}; };
await _dbContext.InsertAsync(entity); await _dbContext.InsertAsync(entity);
} }
public async Task<MealUserResponse> GetMealUserAsync(string userId)
{
return await _dbContext.Queryable<CanteenUserEntity>()
.Where(x => x.UserNo == userId)
.Select<MealUserResponse>()
.FirstAsync();
}
} }

6
Src/Dlhis.Canteen/Setting/Controllers/SettingController.cs
View File

@@ -59,11 +59,11 @@ public class SettingController : ControllerBase
/// <summary> /// <summary>
/// 获取用户配置 /// 获取用户配置
/// </summary> /// </summary>
/// <param name="userId"></param> /// <param name="userNo"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("user")] [HttpGet("user")]
public async Task<Dictionary<CanteenSettingItemEnumType, string>> GetUserSettingAsync(string userId) public async Task<Dictionary<CanteenSettingItemEnumType, string>> GetUserSettingAsync(string userNo)
{ {
return await _settingService.GetUserSettingAsync(userId); return await _settingService.GetUserSettingAsync(userNo);
} }
} }

4
Src/Dlhis.Canteen/Setting/Services/ICanteenSettingService.cs
View File

@@ -16,8 +16,8 @@ public interface ICanteenSettingService : IScopeDependency
/// <summary> /// <summary>
/// 获取人员的就餐配置信息 /// 获取人员的就餐配置信息
/// </summary> /// </summary>
/// <param name="userId">就餐人员档案号</param> /// <param name="userNo">就餐人员档案号</param>
/// <returns></returns> /// <returns></returns>
Task<Dictionary<CanteenSettingItemEnumType, string>> GetUserSettingAsync(string userId); Task<Dictionary<CanteenSettingItemEnumType, string>> GetUserSettingAsync(string userNo);
} }

4
Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs
View File

@@ -72,10 +72,10 @@ public class CanteenSettingService : ICanteenSettingService
} }
public async Task<Dictionary<CanteenSettingItemEnumType, string>> GetUserSettingAsync(string userId) public async Task<Dictionary<CanteenSettingItemEnumType, string>> GetUserSettingAsync(string userNo)
{ {
var setting = await _context.Queryable<CanteenSettingEntity>() var setting = await _context.Queryable<CanteenSettingEntity>()
.Where(x => x.UniqueType == CanteenSettingUnqiueEnumType.Person && (x.UniqueValue == userId) || x.UniqueType == CanteenSettingUnqiueEnumType.Tenant) .Where(x => x.UniqueType == CanteenSettingUnqiueEnumType.Person && (x.UniqueValue == userNo) || x.UniqueType == CanteenSettingUnqiueEnumType.Tenant)
.ToListAsync(); .ToListAsync();
//从基地 -> 个人,确保下面循环做到覆盖,并且以个人配置为主 //从基地 -> 个人,确保下面循环做到覆盖,并且以个人配置为主