|
@@ -21,6 +21,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
private JsonView _jv;
|
|
|
private string _url;
|
|
|
private string _excelPath;
|
|
|
+ private List<int> _goodsTypeIds; //多部门审核物品类型Id
|
|
|
public GoodsRepository(SqlSugarClient sqlSugar, IMapper mapper) : base(sqlSugar)
|
|
|
{
|
|
|
_mapper = mapper;
|
|
@@ -31,6 +32,9 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
{
|
|
|
Directory.CreateDirectory(_excelPath);
|
|
|
}
|
|
|
+ _goodsTypeIds = new List<int>() {
|
|
|
+ 1423, //1423 贵重物品
|
|
|
+ };
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
@@ -331,12 +335,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
/// <returns></returns>
|
|
|
public bool GoodsAuditType(int goodsTypeId)
|
|
|
{
|
|
|
- //多部门审核类型Id
|
|
|
- var goodsTypeIds = new List<int>() {
|
|
|
- 1423, //1423 贵重物品
|
|
|
- };
|
|
|
-
|
|
|
- if (goodsTypeIds.Contains(goodsTypeId))
|
|
|
+ if (_goodsTypeIds.Contains(goodsTypeId))
|
|
|
{
|
|
|
return true;
|
|
|
}
|
|
@@ -1243,8 +1242,6 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
return _jv;
|
|
|
}
|
|
|
|
|
|
- //返回分页数据
|
|
|
- var view = await data.ToPageListAsync(dto.PageIndex, dto.PageSize, total);
|
|
|
|
|
|
//财务人事审核权限处理
|
|
|
var auditList = GoodsStorageConfirmAuditDep(2);
|
|
@@ -1256,6 +1253,11 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
hrAuditPer = true;
|
|
|
}
|
|
|
|
|
|
+ //返回分页数据
|
|
|
+ //领用审核List只显示多条审核数据 陈湘
|
|
|
+ var view = await data.WhereIF(hrAuditPer, x => _goodsTypeIds.Contains(x.GoodsTypeId))
|
|
|
+ .ToPageListAsync(dto.PageIndex, dto.PageSize, total);
|
|
|
+
|
|
|
foreach (var item in view)
|
|
|
{
|
|
|
//默认审核验证 多条 or 单挑
|
|
@@ -1276,7 +1278,6 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
else if (dto.PortType == 1)
|
|
|
{
|
|
|
var view1 = _mapper.Map<List<GoodsReceiveListView>>(view);
|
|
|
-
|
|
|
_jv.Data = view1;
|
|
|
}
|
|
|
|