Commit e14136f3 authored by 吴春's avatar 吴春

提交代码

parent a9221dec
......@@ -538,7 +538,7 @@ namespace Edu.Module.EduTask
/// <param name="model"></param>
/// <returns></returns>
[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 = "";
bool flag = false;
......@@ -563,7 +563,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>()
......
......@@ -145,22 +145,22 @@ namespace Edu.WebApi.Controllers.EduTask
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");
}
//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)
{
......
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