提交代码

Edu.Model/Entity/EduTask/RB_Education_Receipt.cs

@@ -11,84 +11,89 @@ namespace Edu.Model.Entity.EduTask
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_Education_Receipt
     {
-		/// <summary>
-		/// 主键(教务单据编号)
-		/// </summary>
-		public int Id { get; set; }
-
-		/// <summary>
-		/// 单据标题
-		/// </summary>
-		public string Title { get; set; }
-
-		/// <summary>
-		/// 班级编号
-		/// </summary>
-		public int ClassId { get; set; }
-
-		/// <summary>
-		/// 订单编号
-		/// </summary>
-		public int OrderId { get; set; }
-
-		/// <summary>
-		/// 单据类型
-		/// </summary>
-		public ReceiptTypeEnum ReceiptType { get; set; }
-
-		/// <summary>
-		/// 关联编号(根据单据类型匹配)
-		/// </summary>
-		public int RelationId { get; set; }
-
-		/// <summary>
-		/// 集团编号
-		/// </summary>
-		public int Group_Id { get; set; }
-
-		/// <summary>
-		/// 学校编号
-		/// </summary>
-		public int School_Id { get; set; }
-
-		/// <summary>
-		/// 创建人
-		/// </summary>
-		public int CreateBy { get; set; }
-
-		/// <summary>
-		/// 创建时间
-		/// </summary>
-		public DateTime CreateTime { get; set; }
-
-		/// <summary>
-		/// 修改人
-		/// </summary>
-		public int UpdateBy { get; set; }
-
-		/// <summary>
-		/// 更新时间
-		/// </summary>
-		public DateTime UpdateTime { get; set; }
-
-		/// <summary>
-		/// 抄送人(多个逗号分隔)
-		/// </summary>
-		public string RecipientIds { get; set; }
-
-		/// <summary>
-		/// 审核状态(见枚举)
-		/// </summary>
-		public Edu.Common.Enum.EduTask.EduTaskRrocessStatus VerifyStatus { get; set; }	       
-		
-		/// <summary>
-		/// 是否生成相应单据
-		/// </summary>
-		public int IsCreate { get; set; }
-
-		/// <summary>
-		/// 生效时间
-		/// </summary>
-		public DateTime? EffectiveDate { get; set; }
-	}
+        /// <summary>
+        /// 主键(教务单据编号)
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 单据标题
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 班级编号
+        /// </summary>
+        public int ClassId { get; set; }
+
+        /// <summary>
+        /// 订单编号
+        /// </summary>
+        public int OrderId { get; set; }
+
+        /// <summary>
+        /// 单据类型
+        /// </summary>
+        public ReceiptTypeEnum ReceiptType { get; set; }
+
+        /// <summary>
+        /// 关联编号(根据单据类型匹配)
+        /// </summary>
+        public int RelationId { get; set; }
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime UpdateTime { get; set; }
+
+        /// <summary>
+        /// 抄送人(多个逗号分隔)
+        /// </summary>
+        public string RecipientIds { get; set; }
+
+        /// <summary>
+        /// 审核状态(见枚举)
+        /// </summary>
+        public Edu.Common.Enum.EduTask.EduTaskRrocessStatus VerifyStatus { get; set; }
+
+        /// <summary>
+        /// 是否生成相应单据
+        /// </summary>
+        public int IsCreate { get; set; }
+
+        /// <summary>
+        /// 生效时间
+        /// </summary>
+        public DateTime? EffectiveDate { get; set; }
+
+        /// <summary>
+        /// 附件
+        /// </summary>
+        public string ReceiptFile { get; set; }
+    }
 }

Edu.Model/ViewModel/EduTask/RB_Education_Receipt_ViewModel.cs

@@ -39,5 +39,10 @@ namespace Edu.Model.ViewModel.EduTask
         /// 课程名称
         /// </summary>
         public string CourseName { get; set; }
+
+        /// <summary>
+        /// 附件list
+        /// </summary>
+        public List<string> ReceiptFileList { get; set; }
     }
 }

Edu.Module.EduTask/EducationReceiptModule.cs

@@ -458,6 +458,7 @@ namespace Edu.Module.EduTask
                         AuditObj,
                         item.VerifyStatus,
                         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);
                 }

Edu.WebApi/Controllers/Finance/FinanceController.cs

@@ -1037,6 +1037,7 @@ namespace Edu.WebApi.Controllers.Finance
                 x.ClassName,
                 x.ClassNo,
                 x.StudentName,
+                x.GuestId,
                 x.CreateByName,
                 x.CreateByPhoto,
                 x.TotalCourseFee,