fix 营业点增加供应商(承包商)
This commit is contained in:
@@ -25,6 +25,11 @@ public class BusinessPlaceSaveRequest
|
||||
[Required(ErrorMessage = "营业点名称不能为空")]
|
||||
public string Name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 供应商
|
||||
/// </summary>
|
||||
public string Supplier { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 状态 CanteenBusinessPlaceStatusEnumType
|
||||
/// </summary>
|
||||
|
||||
@@ -23,6 +23,12 @@ public class BusinessPlaceResponse
|
||||
/// </summary>
|
||||
public string Name { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 供应商
|
||||
/// </summary>
|
||||
public string Supplier { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 状态,停用/启用
|
||||
/// </summary>
|
||||
|
||||
@@ -25,7 +25,7 @@ public class BusinessPlaceService : IBusinessPlaceService
|
||||
var page = await _dbContext.Queryable<BusinessPlaceEntity>()
|
||||
.LeftJoin<BusinessPlaceShiftRelationshipEntity>((x, ps) => x.Code == ps.PlaceCode)
|
||||
.LeftJoin<BusinessShiftEntity>((x, ps, s) => s.Code == ps.ShiftCode)
|
||||
.WhereIF(request.Search.IsPresent(), x => x.CustomCode.Contains(request.Search)
|
||||
.WhereIF(request.Search.IsPresent(), x => x.CustomCode.Contains(request.Search)
|
||||
|| x.Code.ToString().Contains(request.Search) || x.Name.Contains(request.Search))
|
||||
.WhereIF(request.Catalog.HasValue, x => x.Catalog == request.Catalog)
|
||||
.WhereIF(request.Status.HasValue, x => x.Status == request.Status)
|
||||
@@ -39,7 +39,7 @@ public class BusinessPlaceService : IBusinessPlaceService
|
||||
Catalog = x.Catalog,
|
||||
CustomCode = x.CustomCode,
|
||||
Source = x.Source,
|
||||
|
||||
Supplier = x.Supplier,
|
||||
ShiftCode = s.Code,
|
||||
ShiftName = s.Name
|
||||
})
|
||||
@@ -65,6 +65,7 @@ public class BusinessPlaceService : IBusinessPlaceService
|
||||
if (!request.Id.HasValue)
|
||||
{
|
||||
var entity = request.Adapt<BusinessPlaceEntity>();
|
||||
entity.CustomCode = request.CustomCode;
|
||||
entity.Code = Guid.NewGuid();
|
||||
await _dbContext.InsertAsync(entity);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user