提交代码

Edu.Module.EduTask/OrderChangeModule.cs

@@ -92,7 +92,7 @@ namespace Edu.Module.EduTask
         /// <param name="model"></param>
         /// <returns></returns>
         [TransactionCallHandler]
-        public virtual bool SetOrderChangeModule(RB_Order_Change_ViewModel model, out string message)
+        public virtual bool SetOrderChangeModule(RB_Order_Change_ViewModel model,string receiptFile, out string message)
         {
             message = "";
             bool flag = false;
@@ -117,7 +117,8 @@ namespace Edu.Module.EduTask
                     UpdateTime = model.UpdateTime,
                     VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
                     IsCreate = 0,
-                    EffectiveDate = model.EffectiveDate
+                    EffectiveDate = model.EffectiveDate,
+                    ReceiptFile= receiptFile
                 };
                 flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out message);
                 Dictionary<string, object> guestFileds = new Dictionary<string, object>()

Edu.WebApi/Controllers/EduTask/OrderChangeController.cs

@@ -7,6 +7,7 @@ using Edu.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Edu.WebApi.Controllers.EduTask
@@ -54,6 +55,23 @@ namespace Edu.WebApi.Controllers.EduTask
                 OrderGuestId=base.ParmJObj.GetInt("OrderGuestId"),
                 OutTime=base.ParmJObj.GetDateTime("OutTime"),
             };
+            string receiptFile = string.Empty;
+            //try
+            //{
+            //    List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
+            //    if (receiptFileList == null || !receiptFileList.Any())
+            //    {
+            //        return ApiResult.Failed("附件必须上传");
+            //    }
+            //    else
+            //    {
+            //        receiptFile = JsonHelper.Serialize(receiptFileList);
+            //    }
+            //}
+            //catch (Exception ex)
+            //{
+            //    Common.Plugin.LogHelper.Write(ex, "SetOrderChange");
+            //}
             if (Convert.ToDateTime(Common.ConvertHelper.FormatDate(model.OutTime)) < Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)) )
             {
                 return ApiResult.ParamIsNull(message: "转出本班日期必须大于今天!");
@@ -103,7 +121,7 @@ namespace Edu.WebApi.Controllers.EduTask
             model.School_Id = classModel.School_Id;
             model.UpdateBy = base.UserInfo.Id;
             model.UpdateTime = DateTime.Now;
-            bool flag = orderChangeModule.SetOrderChangeModule(model, out string message);
+            bool flag = orderChangeModule.SetOrderChangeModule(model, receiptFile, out string message);
             return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
         }
 
@@ -126,7 +144,23 @@ namespace Edu.WebApi.Controllers.EduTask
                 OrderGuestId = base.ParmJObj.GetInt("OrderGuestId"),
                 OutTime = base.ParmJObj.GetDateTime("OutTime"),
             };
-             
+            string receiptFile = string.Empty;
+            try
+            {
+                List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
+                if (receiptFileList == null || !receiptFileList.Any())
+                {
+                    return ApiResult.Failed("附件必须上传");
+                }
+                else
+                {
+                    receiptFile = JsonHelper.Serialize(receiptFileList);
+                }
+            }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "SetOrderSplit");
+            }
             var oldOrderModel = orderModule.GetClassOrderInfoModule(model.SourceOrderId);
             if (oldOrderModel == null)
             {
@@ -144,7 +178,7 @@ namespace Edu.WebApi.Controllers.EduTask
             model.School_Id = classModel.School_Id;
             model.UpdateBy = base.UserInfo.Id;
             model.UpdateTime = DateTime.Now;
-            bool flag = orderChangeModule.SetOrderSplitModule(model, out string message);
+            bool flag = orderChangeModule.SetOrderSplitModule(model, receiptFile, out string message);
             return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
         }
     }