fix 名称转换
This commit is contained in:
@@ -73,18 +73,7 @@ public class AppointmentDetailResponse
|
||||
/// <summary>
|
||||
/// 申请车间区域
|
||||
/// </summary>
|
||||
public List<string> ApplyWorkplaceAreas
|
||||
{
|
||||
get
|
||||
{
|
||||
return ApplyWorkplaceAreasString.IsPresent()
|
||||
? ApplyWorkplaceAreasString.ToObject<List<string>>()
|
||||
: new List<string>(0);
|
||||
}
|
||||
}
|
||||
|
||||
[JsonIgnore]
|
||||
public string ApplyWorkplaceAreasString { get; set; }
|
||||
public List<string> ApplyWorkplaceAreas { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 车间访问开始
|
||||
|
||||
@@ -65,11 +65,11 @@ public class AppointmentService : IAppointmentService
|
||||
Phone = x.Phone,
|
||||
LicensePlate = x.LicensePlate,
|
||||
IsEnterDoorArea = x.IsEnterDoorArea,
|
||||
ApplyDoorArea = x.ApplyDoorArea,
|
||||
ApplyDoorArea = SqlFunc.Subqueryable<AppointmentAreaEntity>().Where(p => p.CustomCode == x.ApplyDoorArea).Select(p => p.Name),
|
||||
DoorStart = x.DoorStart,
|
||||
DoorEnd = x.DoorEnd,
|
||||
IsEnterWorkplace = x.IsEnterWorkplace,
|
||||
ApplyWorkplaceAreasString = x.ApplyWorkplaceAreas.ToString(),
|
||||
ApplyWorkplaceAreas = SqlFunc.Subqueryable<AppointmentAreaEntity>().Where(p => x.ApplyWorkplaceAreas.ToString().Contains(p.CustomCode)).ToList(p => p.Name),
|
||||
WorkplaceStart = x.WorkplaceStart,
|
||||
WorkplaceEnd = x.WorkplaceEnd,
|
||||
ImageUrl = x.ImageUrl,
|
||||
|
||||
@@ -173,7 +173,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
|
||||
{
|
||||
Id = x.Id,
|
||||
OriginUserUniqueNo = x.UserUniqueNo,
|
||||
OutsourceSupplier = device.Supplier,
|
||||
OutsourceSupplier = os.Supplier,
|
||||
SapUserCode = os.SapCode,
|
||||
SapUserName = SqlFunc.Subqueryable<GainfoEntity>().Where(p => p.Code == os.SapCode).Select(p => p.Name),
|
||||
DeviceUniqueNo = x.DeviceUniqueNo,
|
||||
|
||||
Reference in New Issue
Block a user