Skip to content

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

提交代码

parent 70dba634
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 15 deletions
Edu.Module.Course/OrderModule2.cs
View file @ a9221dec
...@@ -48,7 +48,7 @@ namespace Edu.Module.Course ...@@ -48,7 +48,7 @@ namespace Edu.Module.Course
/// <param name="userinfo"></param> /// <param name="userinfo"></param>
/// <param name="message"></param> /// <param name="message"></param>
/// <returns></returns> /// <returns></returns>
public virtual bool CreateBackClassApplyModule(int GuestId, int OrderId, string reason, UserInfo userinfo, out string message) public virtual bool CreateBackClassApplyModule(int GuestId, int OrderId, string reason, UserInfo userinfo,string receiptFile, out string message)
{ {
bool flag; bool flag;
message = ""; message = "";
......
Edu.Module.EduTask/ChangeClassPlanModule.cs
View file @ a9221dec
...@@ -47,7 +47,7 @@ namespace Edu.Module.EduTask ...@@ -47,7 +47,7 @@ namespace Edu.Module.EduTask
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[TransactionCallHandler] [TransactionCallHandler]
public virtual bool SetChangeClassPlanModule(RB_Change_ClassPlan_ViewModel extModel) public virtual bool SetChangeClassPlanModule(RB_Change_ClassPlan_ViewModel extModel, string receiptFile)
{ {
bool flag = false; bool flag = false;
if (extModel.Id > 0) if (extModel.Id > 0)
...@@ -84,7 +84,8 @@ namespace Edu.Module.EduTask ...@@ -84,7 +84,8 @@ namespace Edu.Module.EduTask
CreateTime = extModel.CreateTime, CreateTime = extModel.CreateTime,
UpdateBy = extModel.UpdateBy, UpdateBy = extModel.UpdateBy,
UpdateTime = extModel.UpdateTime, UpdateTime = extModel.UpdateTime,
VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
ReceiptFile = receiptFile
}; };
flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out string message); flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out string message);
} }
......
Edu.Module.EduTask/StopStudentClassModule.cs
View file @ a9221dec
...@@ -68,7 +68,7 @@ namespace Edu.Module.EduTask ...@@ -68,7 +68,7 @@ namespace Edu.Module.EduTask
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[TransactionCallHandler] [TransactionCallHandler]
public virtual bool SetStudentStopClassModule(RB_Student_StopClass_ViewModel extModel) public virtual bool SetStudentStopClassModule(RB_Student_StopClass_ViewModel extModel,string receiptFile)
{ {
bool flag = false; bool flag = false;
if (extModel.Id > 0) if (extModel.Id > 0)
...@@ -112,7 +112,8 @@ namespace Edu.Module.EduTask ...@@ -112,7 +112,8 @@ namespace Edu.Module.EduTask
CreateTime = extModel.CreateTime, CreateTime = extModel.CreateTime,
UpdateBy = extModel.UpdateBy, UpdateBy = extModel.UpdateBy,
UpdateTime = extModel.UpdateTime, UpdateTime = extModel.UpdateTime,
VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
ReceiptFile= receiptFile
}; };
flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out string message); flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out string message);
} }
......
Edu.Module.EduTask/TempInvitationClassModule.cs
View file @ a9221dec
...@@ -44,7 +44,7 @@ namespace Edu.Module.EduTask ...@@ -44,7 +44,7 @@ namespace Edu.Module.EduTask
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[TransactionCallHandler] [TransactionCallHandler]
public virtual bool SetStudentTempInvitationModule(RB_Student_TempInvitation_ViewModel extModel) public virtual bool SetStudentTempInvitationModule(RB_Student_TempInvitation_ViewModel extModel, string receiptFile)
{ {
bool flag = false; bool flag = false;
if (extModel.Id > 0) if (extModel.Id > 0)
...@@ -82,7 +82,8 @@ namespace Edu.Module.EduTask ...@@ -82,7 +82,8 @@ namespace Edu.Module.EduTask
CreateTime = extModel.CreateTime, CreateTime = extModel.CreateTime,
UpdateBy = extModel.UpdateBy, UpdateBy = extModel.UpdateBy,
UpdateTime = extModel.UpdateTime, UpdateTime = extModel.UpdateTime,
VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit,
ReceiptFile = receiptFile
}; };
flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out string message); flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out string message);
} }
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ a9221dec
...@@ -2054,7 +2054,25 @@ namespace Edu.WebApi.Controllers.Course ...@@ -2054,7 +2054,25 @@ namespace Edu.WebApi.Controllers.Course
var OrderId = base.ParmJObj.GetInt("OrderId"); var OrderId = base.ParmJObj.GetInt("OrderId");
//申请原因 //申请原因
var applyReason = base.ParmJObj.GetStringValue("applyReason"); var applyReason = base.ParmJObj.GetStringValue("applyReason");
bool flag = orderModule.CreateBackClassApplyModule(GuestId, OrderId, applyReason, base.UserInfo, out string message); 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, "BackClassApply");
//}
bool flag = orderModule.CreateBackClassApplyModule(GuestId, OrderId, applyReason, base.UserInfo, receiptFile, out string message);
return flag ? ApiResult.Success(message: message) : ApiResult.Failed(message: message); return flag ? ApiResult.Success(message: message) : ApiResult.Failed(message: message);
} }
#endregion #endregion
......
Edu.WebApi/Controllers/EduTask/ChangePlanController.cs
View file @ a9221dec
...@@ -50,10 +50,17 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -50,10 +50,17 @@ namespace Edu.WebApi.Controllers.EduTask
Remarks = base.ParmJObj.GetStringValue("Remarks") Remarks = base.ParmJObj.GetStringValue("Remarks")
}; };
var classModel = classModule.GetClassModule(model.ClassId); var classModel = classModule.GetClassModule(model.ClassId);
string receiptFile = string.Empty;
try 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);
//}
if (model.MoveType == 1) if (model.MoveType == 1)
{ {
model.OldChangePlanItemList = Common.Plugin.JsonHelper.DeserializeObject<List<ChangePlanItem>>(base.ParmJObj.GetStringValue("OldChangePlanItemList")); model.OldChangePlanItemList = Common.Plugin.JsonHelper.DeserializeObject<List<ChangePlanItem>>(base.ParmJObj.GetStringValue("OldChangePlanItemList"));
...@@ -243,7 +250,7 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -243,7 +250,7 @@ namespace Edu.WebApi.Controllers.EduTask
} }
model.UpdateBy = base.UserInfo.Id; model.UpdateBy = base.UserInfo.Id;
model.UpdateTime = DateTime.Now; model.UpdateTime = DateTime.Now;
bool flag = changeClassPlanModule.SetChangeClassPlanModule(model); bool flag = changeClassPlanModule.SetChangeClassPlanModule(model, receiptFile);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
......
Edu.WebApi/Controllers/EduTask/StopStudentClassController.cs
View file @ a9221dec
...@@ -50,6 +50,7 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -50,6 +50,7 @@ namespace Edu.WebApi.Controllers.EduTask
OldStudentStatus= base.ParmJObj.GetInt("OldStudentStatus") OldStudentStatus= base.ParmJObj.GetInt("OldStudentStatus")
}; };
var classModel = classModule.GetClassModule(model.ClassId); var classModel = classModule.GetClassModule(model.ClassId);
string receiptFile = string.Empty;
try try
{ {
string takeEffectTime = base.ParmJObj.GetStringValue("TakeEffectTime"); string takeEffectTime = base.ParmJObj.GetStringValue("TakeEffectTime");
...@@ -58,12 +59,22 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -58,12 +59,22 @@ namespace Edu.WebApi.Controllers.EduTask
return ApiResult.Failed("请选择生效日期"); return ApiResult.Failed("请选择生效日期");
} }
model.TakeEffectTime = Convert.ToDateTime(takeEffectTime); model.TakeEffectTime = Convert.ToDateTime(takeEffectTime);
//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) catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "SetStudentStopClass"); Common.Plugin.LogHelper.Write(ex, "SetStudentStopClass");
} }
if (model.Id == 0) if (model.Id == 0)
{ {
model.CreateBy = base.UserInfo.Id; model.CreateBy = base.UserInfo.Id;
...@@ -74,7 +85,7 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -74,7 +85,7 @@ namespace Edu.WebApi.Controllers.EduTask
model.UpdateBy = base.UserInfo.Id; model.UpdateBy = base.UserInfo.Id;
model.UpdateTime = DateTime.Now; model.UpdateTime = DateTime.Now;
model.IsAuditThrough = 0; model.IsAuditThrough = 0;
bool flag = stopStudentClassModule.SetStudentStopClassModule(model); bool flag = stopStudentClassModule.SetStudentStopClassModule(model, receiptFile);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
......
Edu.WebApi/Controllers/EduTask/TempInvitationClassController.cs
View file @ a9221dec
...@@ -68,7 +68,23 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -68,7 +68,23 @@ namespace Edu.WebApi.Controllers.EduTask
{ {
return ApiResult.Failed("请选择您要邀请的时间"); return ApiResult.Failed("请选择您要邀请的时间");
} }
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, "SetStudentTempInvitation");
//}
//判断之前是否有申请过，没有才添加 //判断之前是否有申请过，没有才添加
var studentTempIvvitationList = tempInvitationClassModule.GetTemporaryInvitationListRepository(new RB_Student_TempInvitation_ViewModel { ClassId = model.ClassId }); var studentTempIvvitationList = tempInvitationClassModule.GetTemporaryInvitationListRepository(new RB_Student_TempInvitation_ViewModel { ClassId = model.ClassId });
if (studentTempIvvitationList != null && studentTempIvvitationList.Any()) if (studentTempIvvitationList != null && studentTempIvvitationList.Any())
...@@ -108,7 +124,7 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -108,7 +124,7 @@ namespace Edu.WebApi.Controllers.EduTask
} }
model.UpdateBy = base.UserInfo.Id; model.UpdateBy = base.UserInfo.Id;
model.UpdateTime = DateTime.Now; model.UpdateTime = DateTime.Now;
bool flag = tempInvitationClassModule.SetStudentTempInvitationModule(model); bool flag = tempInvitationClassModule.SetStudentTempInvitationModule(model, receiptFile);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
......
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