Commit 62988872 authored by liudong1993's avatar liudong1993

行政中心, 流程问题处理

parent bd7ce160
...@@ -12,6 +12,17 @@ namespace Edu.Model.ViewModel.User ...@@ -12,6 +12,17 @@ namespace Edu.Model.ViewModel.User
[DB(ConnectionName = "DefaultConnection")] [DB(ConnectionName = "DefaultConnection")]
public class Rb_Workflow_AuditUserRelevance_Extend : Rb_Workflow_AuditUserRelevance public class Rb_Workflow_AuditUserRelevance_Extend : Rb_Workflow_AuditUserRelevance
{ {
/// <summary>
///
/// </summary>
public string EmName { get; set; }
/// <summary>
/// ˺
/// </summary>
public string EmAccount { get; set; }
/// <summary>
/// ¼ֻ
/// </summary>
public string EmLoginMobile { get; set; }
} }
} }
\ No newline at end of file
...@@ -3748,7 +3748,8 @@ namespace Edu.Module.User ...@@ -3748,7 +3748,8 @@ namespace Edu.Module.User
} }
else if (auditRelevance.AuditType == WFTAuditTypeEnum.SpecifiedMember)//指定人审核 else if (auditRelevance.AuditType == WFTAuditTypeEnum.SpecifiedMember)//指定人审核
{ {
List<Rb_Workflow_Audituser_Extend> audituserList = auditUserRepository.GetConditionAuditUser(auditRelevance.OriginalAuditId.Value); var audituserList = auditUserRelevanceRepository.GetListForRelevanceId(auditRelevance.Id);
//List<Rb_Workflow_Audituser_Extend> audituserList = auditUserRepository.GetConditionAuditUser(auditRelevance.OriginalAuditId.Value);
if (audituserList.Count > 0) if (audituserList.Count > 0)
{ {
AuditAccountList = audituserList.Select(x => new EmAccoutIdModel() { EmAccount = x.EmLoginMobile, EmployeeId = x.EmployeeId ?? 0 }).Distinct().ToList(); AuditAccountList = audituserList.Select(x => new EmAccoutIdModel() { EmAccount = x.EmLoginMobile, EmployeeId = x.EmployeeId ?? 0 }).Distinct().ToList();
......
...@@ -22,5 +22,15 @@ namespace Edu.Repository.User ...@@ -22,5 +22,15 @@ namespace Edu.Repository.User
{ {
return Get<Rb_Workflow_AuditUserRelevance_Extend>($"SELECT * from rb_workflow_audituserrelevance u where u.AuditRelevanceId ={auditRelevanceId}").ToList(); return Get<Rb_Workflow_AuditUserRelevance_Extend>($"SELECT * from rb_workflow_audituserrelevance u where u.AuditRelevanceId ={auditRelevanceId}").ToList();
} }
/// <summary>
/// 获取指定审核成员
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
public List<Rb_Workflow_AuditUserRelevance_Extend> GetListForRelevanceId(int Id)
{
return Get<Rb_Workflow_AuditUserRelevance_Extend>($@"select au.*,e.EmName,e.EmAccount,e.EmLoginMobile from rb_workflow_audituserrelevance au left join rb_employee e on au.EmployeeId=e.EmployeeId where au.AuditRelevanceId={Id}").ToList();
}
} }
} }
...@@ -101,7 +101,8 @@ namespace Edu.WebApi.Controllers.Course ...@@ -101,7 +101,8 @@ namespace Edu.WebApi.Controllers.Course
return ApiResult.Success("", list.Select(x => new return ApiResult.Success("", list.Select(x => new
{ {
x.ClassId, x.ClassId,
x.ClassName x.ClassName,
x.School_Id
})); }));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment