Commit 41d71833 authored by 吴春's avatar 吴春

提交代码

parent 4f1e298a
...@@ -90,5 +90,10 @@ namespace Edu.Model.Entity.EduTask ...@@ -90,5 +90,10 @@ namespace Edu.Model.Entity.EduTask
/// 生效时间 /// 生效时间
/// </summary> /// </summary>
public DateTime? EffectiveDate { get; set; } public DateTime? EffectiveDate { get; set; }
/// <summary>
/// 附件
/// </summary>
public string ReceiptFile { get; set; }
} }
} }
...@@ -39,5 +39,10 @@ namespace Edu.Model.ViewModel.EduTask ...@@ -39,5 +39,10 @@ namespace Edu.Model.ViewModel.EduTask
/// 课程名称 /// 课程名称
/// </summary> /// </summary>
public string CourseName { get; set; } public string CourseName { get; set; }
/// <summary>
/// 附件list
/// </summary>
public List<string> ReceiptFileList { get; set; }
} }
} }
...@@ -458,6 +458,7 @@ namespace Edu.Module.EduTask ...@@ -458,6 +458,7 @@ namespace Edu.Module.EduTask
AuditObj, AuditObj,
item.VerifyStatus, item.VerifyStatus,
AuditStatusName = item.VerifyStatus == Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit ? "待审" : item.VerifyStatus.ToName(), AuditStatusName = item.VerifyStatus == Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit ? "待审" : item.VerifyStatus.ToName(),
ReceiptFileList= string.IsNullOrWhiteSpace(item.ReceiptFile)?new List<string>() : Common.Plugin.JsonHelper.DeserializeObject<List<string>>(item.ReceiptFile)
}; };
result.Add(obj); result.Add(obj);
} }
......
This diff is collapsed.
...@@ -1037,6 +1037,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -1037,6 +1037,7 @@ namespace Edu.WebApi.Controllers.Finance
x.ClassName, x.ClassName,
x.ClassNo, x.ClassNo,
x.StudentName, x.StudentName,
x.GuestId,
x.CreateByName, x.CreateByName,
x.CreateByPhoto, x.CreateByPhoto,
x.TotalCourseFee, x.TotalCourseFee,
......
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