RIZO/ziyuandigitalbackend
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

零件号

Browse Source
This commit is contained in:
qianhao.xu 2024-08-21 09:32:03 +08:00
parent f0f11d1950
commit 9853e11492
6 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DOAN.Admin.WebApi/Controllers/TenantController.cs
View File

@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using DOAN.Service.IService;
using SqlSugar;
using DOAN.Model;
namespace DOAN.Admin.WebApi.Controllers
{
/// <summary>
@ -12,6 +13,8 @@ namespace DOAN.Admin.WebApi.Controllers
public class TenantController : BaseController
{
private ITenantService tenantService;
public TenantController(ITenantService tenantService)
{
this.tenantService = tenantService;

2
DOAN.Model/huate_group/MasterDataManagement/BasePartnumber.cs
View File

@ -23,7 +23,7 @@ namespace DOAN.Model.huate_group.MasterDataManagement
/// 租户号
/// </summary>
[SugarColumn(ColumnName = "tENANT_ID")]
public string TenantId { get; set; }
public int TenantId { get; set; }
/// <summary>
/// 创建人

4
DOAN.Model/huate_group/MasterDataManagement/Dto/BasePartnumberDto.cs
View File

@ -6,6 +6,8 @@ namespace DOAN.Model.huate_group.MasterDataManagement.Dto
/// </summary>
public class BasePartnumberQueryDto : PagerInfo
{
public string PartnumberName { get; set; }
public int TenantId { get; set; }
}
/// <summary>
@ -18,7 +20,7 @@ namespace DOAN.Model.huate_group.MasterDataManagement.Dto
public string PartnumberName { get; set; }
public string TenantId { get; set; }
public int TenantId { get; set; }
public string CreatedBy { get; set; }

3
DOAN.Model/huate_group/MasterDataManagement/Dto/BaseVehiclemodelDto.cs
View File

@ -6,6 +6,9 @@ namespace DOAN.Model.huate_group.MasterDataManagement.Dto
/// </summary>
public class BaseVehiclemodelQueryDto : PagerInfo
{
public string VehicelModelName { get; set; }
public int? TenantId { get; set; }
}
/// <summary>

6
DOAN.Service/huate_group/MasterDataManagement/BasePartnumberService.cs
View File

@ -72,7 +72,11 @@ namespace DOAN.Service.huate_group.MasterDataManagement
/// <returns></returns>
private static Expressionable<BasePartnumber> QueryExp(BasePartnumberQueryDto parm)
{
var predicate = Expressionable.Create<BasePartnumber>();
var predicate = Expressionable.Create<BasePartnumber>()
.AndIF(parm != null && parm.TenantId > 0, it => it.TenantId == parm.TenantId)
.AndIF(parm != null && !string.IsNullOrEmpty(parm.PartnumberName), it => it.PartnumberName.Contains(parm.PartnumberName));
;
return predicate;
}

9
DOAN.Service/huate_group/MasterDataManagement/BaseVehiclemodelService.cs
View File

@ -21,7 +21,9 @@ namespace DOAN.Service.huate_group.MasterDataManagement
/// <returns></returns>
public PagedInfo<BaseVehiclemodelDto> GetList(BaseVehiclemodelQueryDto parm)
{
var predicate = QueryExp(parm);
var predicate = QueryExp(parm)
;
var response = Queryable()
.Where(predicate.ToExpression())
@ -72,7 +74,10 @@ namespace DOAN.Service.huate_group.MasterDataManagement
/// <returns></returns>
private static Expressionable<BaseVehiclemodel> QueryExp(BaseVehiclemodelQueryDto parm)
{
var predicate = Expressionable.Create<BaseVehiclemodel>();
var predicate = Expressionable.Create<BaseVehiclemodel>()
.AndIF(parm!=null&&parm.TenantId>0,it=>it.TenantId == parm.TenantId)
.AndIF(parm!=null&&!string.IsNullOrEmpty(parm.VehicelModelName), it=>it.VehicelModelName.Contains(parm.VehicelModelName));
;
return predicate;
}