同步master分支差异

This commit is contained in:
不做码农
2022-12-06 14:49:30 +08:00
parent cfc8eee2a3
commit b83311c14e
11 changed files with 26 additions and 403 deletions

View File

@@ -1,49 +0,0 @@
using Infrastructure;
using Infrastructure.Attribute;
using ZR.Model;
using ZR.Model.Dto;
using ZR.Model.Models;
using ZR.Repository;
using ZR.Service.Business.IBusinessService;
using System;
using SqlSugar;
using System.Collections.Generic;
namespace ZR.Service.Business
{
/// <summary>
/// 演示Service业务层处理
///
/// @author zz
/// @date 2022-03-31
/// </summary>
[AppService(ServiceType = typeof(IGenDemoService), ServiceLifetime = LifeTime.Transient)]
public class GenDemoService : BaseService<GenDemo>, IGenDemoService
{
#region
/// <summary>
/// 查询演示列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
public PagedInfo<GenDemo> GetList(GenDemoQueryDto parm)
{
//开始拼装查询条件
var predicate = Expressionable.Create<GenDemo>();
//搜索条件查询语法参考Sqlsugar
predicate = predicate.AndIF(parm.Id != null, it => it.Id == parm.Id);
predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.Name), it => it.Name == parm.Name);
predicate = predicate.AndIF(parm.ShowStatus != null, it => it.ShowStatus == parm.ShowStatus);
predicate = predicate.AndIF(parm.BeginAddTime == null, it => it.AddTime >= DateTime.Now.AddDays(-1));
predicate = predicate.AndIF(parm.BeginAddTime != null, it => it.AddTime >= parm.BeginAddTime && it.AddTime <= parm.EndAddTime);
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage(parm);
return response;
}
#endregion
}
}

View File

@@ -1,20 +0,0 @@
using System;
using ZR.Model;
using ZR.Model.Dto;
using ZR.Model.Models;
using System.Collections.Generic;
namespace ZR.Service.Business.IBusinessService
{
/// <summary>
/// 演示service接口
///
/// @author zz
/// @date 2022-03-31
/// </summary>
public interface IGenDemoService : IBaseService<GenDemo>
{
PagedInfo<GenDemo> GetList(GenDemoQueryDto parm);
}
}

View File

@@ -9,9 +9,4 @@
<ProjectReference Include="..\ZR.Repository\ZR.Repository.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Business\" />
<Folder Include="Business\IBusinessService\" />
</ItemGroup>
</Project>