用户列表添加字段是否上传签名

This commit is contained in:
何美荣 2024-09-19 09:36:52 +08:00
parent de6bdd1a18
commit cd07269680
3 changed files with 248 additions and 228 deletions

View File

@ -37,6 +37,7 @@ namespace APT.BaseData.Data.Mapping.FM
builder.HasOne(t => t.Nav_ApproveRole).WithMany().HasForeignKey(t => t.APPROVE_ROLE_ID).OnDelete(DeleteBehavior.Restrict);
builder.Ignore(t => t.TEAM_ID);
builder.Ignore(t => t.Tenant);
builder.Ignore(t => t.IS_SIGN);
}
}
}

View File

@ -180,6 +180,8 @@ namespace APT.BaseData.Domain.Entities.FM
[Description("生产单元")]
public virtual ICollection<T_FM_USER_PRODUCTION_UNIT> Nav_ProdutionUnit { get; set; }
[Description("是否上传签名")]
[DataFieldIngore]
public string IS_SIGN { get; set; }
}
}

View File

@ -137,6 +137,23 @@ namespace APT.FM.WebApi.Controllers.Api.FM
express = express.And(t => t.Nav_BelongRoles.Any(i => i.Nav_BelongRole.NAME.Contains(pageFilter.Parameter1)));
}
var result = this.WitOrderPaged(express, pageFilter);
if (result.Data.Count() > 0)
{
var userIds = result.Data.Select(t => t.ID).ToList();
var signs = this.GetEntities<T_FM_USER_SIGN_FILE>(t => userIds.Contains(t.USER_ID), new BaseFilter(pageFilter.OrgId));
result.Data.ForEach(t =>
{
var temp = signs.FirstOrDefault(m => m.USER_ID == t.ID);
if (temp != null)
{
t.IS_SIGN = "是";
}
else
{
t.IS_SIGN = "否";
}
});
}
return result;
//if (string.IsNullOrEmpty(pageFilter.Parameter1))
//{