首检添加数据看板

This commit is contained in:
2024-06-07 11:04:26 +08:00
parent c93711290e
commit 769d2da1e0
344 changed files with 1772 additions and 2526 deletions

View File

@@ -1,14 +1,9 @@
using System.Collections.Generic;
using Infrastructure.Attribute;
using Infrastructure.Attribute;
using Infrastructure.Extensions;
using Newtonsoft.Json.Linq;
using SqlSugar;
using ZR.Model.mes.md;
using ZR.Model.mes.md.DTO;
using ZR.Model.System;
using ZR.Service.mes.md.IService;
using ZR.Service.System.IService;
using NotImplementedException = System.NotImplementedException;
namespace ZR.Service.mes.md;
@@ -29,19 +24,19 @@ public class MdUnitService : BaseService<MdUnit>, IMdUnitService
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
public MdUnitPageDTO GetList(string name,string code,int pageNum,int pageSize)
public MdUnitPageDTO GetList(string name, string code, int pageNum, int pageSize)
{
int totalNum = 0;
var predicate = Expressionable.Create<MdUnit>()
.AndIF(name.IsNotEmpty(),it=>it.MeasureName.Contains(name))
.AndIF(code.IsNotEmpty(),it=>it.MeasureCode.Contains(code)).ToExpression();
.AndIF(name.IsNotEmpty(), it => it.MeasureName.Contains(name))
.AndIF(code.IsNotEmpty(), it => it.MeasureCode.Contains(code)).ToExpression();
List<MdUnit> data = Context.Queryable<MdUnit>().Where(predicate).ToPageList(pageNum, pageSize, ref totalNum);
MdUnitPageDTO unitPageDto = new MdUnitPageDTO();
unitPageDto.list = data;
unitPageDto.Total = totalNum;
return unitPageDto ;
return unitPageDto;
}
public List<MdUnit> GetList(SearchOptionDTO searchOption)
@@ -52,7 +47,7 @@ public class MdUnitService : BaseService<MdUnit>, IMdUnitService
.AndIF(searchOption.measureCode.IsNotEmpty(), it => it.MeasureCode.Contains(searchOption.measureCode))
.AndIF(searchOption.measureName.IsNotEmpty(), it => it.MeasureCode.Contains(searchOption.measureName))
.ToExpression();
return Context.Queryable<MdUnit>().Where(predicate).ToList();
return Context.Queryable<MdUnit>().Where(predicate).ToList();
}
/// <summary>
@@ -70,5 +65,5 @@ public class MdUnitService : BaseService<MdUnit>, IMdUnitService
return Insert(jo);
}
public int Updateunit(MdUnit jo) => Update(jo,false);
public int Updateunit(MdUnit jo) => Update(jo, false);
}