fix 字段命名错误
This commit is contained in:
@@ -25,7 +25,7 @@ public class MealUserResponse
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 卡号
|
/// 卡号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string CarNo { get; set; }
|
public string CardNo { get; set; }
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ public class MealUserService : IMealUserService
|
|||||||
UserNo = request.UserNo,
|
UserNo = request.UserNo,
|
||||||
UserType = request.UserType,
|
UserType = request.UserType,
|
||||||
UserCode = gainfoEntity.Code,
|
UserCode = gainfoEntity.Code,
|
||||||
CarNo = gainfoEntity.CardNo,
|
CardNo = gainfoEntity.CardNo,
|
||||||
Balance = 0,
|
Balance = 0,
|
||||||
BalanceOfRecharge = 0,
|
BalanceOfRecharge = 0,
|
||||||
BalanceOfSubsidies = 0,
|
BalanceOfSubsidies = 0,
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ public class GainfoSaveRequest : IValidatableObject
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 卡号
|
/// 卡号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string CarNo { get; set; }
|
public string CardNo { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 备注
|
/// 备注
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ public class GainfoPageResponse
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 卡号
|
/// 卡号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string CarNo { get; set; }
|
public string CardNo { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 备注
|
/// 备注
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using Dlhis.Basic.Organization.Response;
|
|||||||
using Dlhis.Entity.Basic.Entity;
|
using Dlhis.Entity.Basic.Entity;
|
||||||
using Dlhis.Entity.Basic.Enums;
|
using Dlhis.Entity.Basic.Enums;
|
||||||
using Dlhis.Entity.Device.Enums;
|
using Dlhis.Entity.Device.Enums;
|
||||||
|
using Dm.filter.rw;
|
||||||
using Kurisu.AspNetCore.Scope;
|
using Kurisu.AspNetCore.Scope;
|
||||||
using Kurisu.AspNetCore.UnifyResultAndValidation;
|
using Kurisu.AspNetCore.UnifyResultAndValidation;
|
||||||
using Kurisu.AspNetCore.Utils.Extensions;
|
using Kurisu.AspNetCore.Utils.Extensions;
|
||||||
@@ -29,7 +30,8 @@ public class GainfoService : IGainfoService
|
|||||||
public GainfoService(IGainfoStore gainfoStore,
|
public GainfoService(IGainfoStore gainfoStore,
|
||||||
IDbContext dbContext,
|
IDbContext dbContext,
|
||||||
ICurrentUser currentUser,
|
ICurrentUser currentUser,
|
||||||
IDevicePermissionService devicePermissionService, ILogger<GainfoService> logger)
|
IDevicePermissionService devicePermissionService,
|
||||||
|
ILogger<GainfoService> logger)
|
||||||
{
|
{
|
||||||
_gainfoStore = gainfoStore;
|
_gainfoStore = gainfoStore;
|
||||||
_dbContext = dbContext;
|
_dbContext = dbContext;
|
||||||
@@ -47,8 +49,11 @@ public class GainfoService : IGainfoService
|
|||||||
{
|
{
|
||||||
request.DepartmentNos = await GetRecursionDepartmentNosAsync(request.DepartmentNos);
|
request.DepartmentNos = await GetRecursionDepartmentNosAsync(request.DepartmentNos);
|
||||||
|
|
||||||
|
var tenant = _currentUser.GetStringTenantId();
|
||||||
|
|
||||||
var page = await _gainfoStore.Queryable(request.Status)
|
var page = await _gainfoStore.Queryable(request.Status)
|
||||||
.WhereIF(request.DepartmentNos?.Any() == true, gainfo => request.DepartmentNos.Contains(gainfo.DepartmentNo))
|
.WhereIF(request.DepartmentNos?.Any() == true, gainfo => request.DepartmentNos.Contains(gainfo.DepartmentNo))
|
||||||
|
.Where(gainfo => gainfo.Werks == tenant)
|
||||||
.Select<GainfoPageResponse>()
|
.Select<GainfoPageResponse>()
|
||||||
.ToPageListAsync(request);
|
.ToPageListAsync(request);
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ public class CanteenUserEntity : SugarBaseEntity, IVersion, ITenantId
|
|||||||
/// 卡号
|
/// 卡号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[SugarColumn(ColumnDescription = "卡号")]
|
[SugarColumn(ColumnDescription = "卡号")]
|
||||||
public string CarNo { get; set; }
|
public string CardNo { get; set; }
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user