Skip to content

E
Education
Commit e14136f3 authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent a9221dec
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 18 deletions
Edu.Module.EduTask/OrderChangeModule.cs
View file @ e14136f3
...@@ -538,7 +538,7 @@ namespace Edu.Module.EduTask ...@@ -538,7 +538,7 @@ namespace Edu.Module.EduTask
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
[TransactionCallHandler] [TransactionCallHandler]
public virtual bool SetOrderSplitModule(RB_Order_Change_ViewModel model, out string message) public virtual bool SetOrderSplitModule(RB_Order_Change_ViewModel model,string receiptFile, out string message)
{ {
message = ""; message = "";
bool flag = false; bool flag = false;
...@@ -563,7 +563,8 @@ namespace Edu.Module.EduTask ...@@ -563,7 +563,8 @@ namespace Edu.Module.EduTask
UpdateTime = model.UpdateTime, UpdateTime = model.UpdateTime,
VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit, VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
IsCreate = 0, IsCreate = 0,
EffectiveDate = model.EffectiveDate EffectiveDate = model.EffectiveDate,
ReceiptFile= receiptFile
}; };
flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out message); flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out message);
//Dictionary<string, object> guestFileds = new Dictionary<string, object>() //Dictionary<string, object> guestFileds = new Dictionary<string, object>()
......
Edu.WebApi/Controllers/EduTask/OrderChangeController.cs
View file @ e14136f3
...@@ -145,22 +145,22 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -145,22 +145,22 @@ namespace Edu.WebApi.Controllers.EduTask
OutTime = base.ParmJObj.GetDateTime("OutTime"), OutTime = base.ParmJObj.GetDateTime("OutTime"),
}; };
string receiptFile = string.Empty; string receiptFile = string.Empty;
try //try
{ //{
List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList")); // List<string> receiptFileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(base.ParmJObj.GetStringValue("ReceiptFileList"));
if (receiptFileList == null || !receiptFileList.Any()) // if (receiptFileList == null || !receiptFileList.Any())
{ // {
return ApiResult.Failed("附件必须上传"); // return ApiResult.Failed("附件必须上传");
} // }
else // else
{ // {
receiptFile = JsonHelper.Serialize(receiptFileList); // receiptFile = JsonHelper.Serialize(receiptFileList);
} // }
} //}
catch (Exception ex) //catch (Exception ex)
{ //{
Common.Plugin.LogHelper.Write(ex, "SetOrderSplit"); // Common.Plugin.LogHelper.Write(ex, "SetOrderSplit");
} //}
var oldOrderModel = orderModule.GetClassOrderInfoModule(model.SourceOrderId); var oldOrderModel = orderModule.GetClassOrderInfoModule(model.SourceOrderId);
if (oldOrderModel == null) if (oldOrderModel == null)
{ {
......
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