Skip to content

E
Education
Commit 6a883d3d authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 51299f76 33334ff0
Hide whitespace changes
Inline Side-by-side
Showing with 207 additions and 104 deletions
Edu.Model/Entity/EduTask/RB_Education_Receipt.cs
View file @ 6a883d3d
......@@ -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
View file @ 6a883d3d
......@@ -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.Course/OrderModule2.cs
View file @ 6a883d3d
......@@ -48,7 +48,7 @@ namespace Edu.Module.Course
/// <param name="userinfo"></param>
/// <param name="message"></param>
/// <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;
message = "";
......
Edu.Module.EduTask/ChangeClassPlanModule.cs
View file @ 6a883d3d
......@@ -47,7 +47,7 @@ namespace Edu.Module.EduTask
/// </summary>
/// <returns></returns>
[TransactionCallHandler]
public virtual bool SetChangeClassPlanModule(RB_Change_ClassPlan_ViewModel extModel)
public virtual bool SetChangeClassPlanModule(RB_Change_ClassPlan_ViewModel extModel, string receiptFile)
{
bool flag = false;
if (extModel.Id > 0)
......@@ -84,7 +84,8 @@ namespace Edu.Module.EduTask
CreateTime = extModel.CreateTime,
UpdateBy = extModel.UpdateBy,
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);
}
......
Edu.Module.EduTask/EducationReceiptModule.cs
View file @ 6a883d3d
......@@ -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.Module.EduTask/OrderChangeModule.cs
View file @ 6a883d3d
......@@ -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>()
......@@ -537,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;
......@@ -562,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>()
......
Edu.Module.EduTask/StopStudentClassModule.cs
View file @ 6a883d3d
......@@ -68,7 +68,7 @@ namespace Edu.Module.EduTask
/// </summary>
/// <returns></returns>
[TransactionCallHandler]
public virtual bool SetStudentStopClassModule(RB_Student_StopClass_ViewModel extModel)
public virtual bool SetStudentStopClassModule(RB_Student_StopClass_ViewModel extModel,string receiptFile)
{
bool flag = false;
if (extModel.Id > 0)
......@@ -112,7 +112,8 @@ namespace Edu.Module.EduTask
CreateTime = extModel.CreateTime,
UpdateBy = extModel.UpdateBy,
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);
}
......
Edu.Module.EduTask/TempInvitationClassModule.cs
View file @ 6a883d3d
......@@ -44,7 +44,7 @@ namespace Edu.Module.EduTask
/// </summary>
/// <returns></returns>
[TransactionCallHandler]
public virtual bool SetStudentTempInvitationModule(RB_Student_TempInvitation_ViewModel extModel)
public virtual bool SetStudentTempInvitationModule(RB_Student_TempInvitation_ViewModel extModel, string receiptFile)
{
bool flag = false;
if (extModel.Id > 0)
......@@ -82,7 +82,8 @@ namespace Edu.Module.EduTask
CreateTime = extModel.CreateTime,
UpdateBy = extModel.UpdateBy,
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);
}
......
Edu.Repository/Course/RB_Order_GuestRepository.cs
View file @ 6a883d3d
......@@ -670,11 +670,11 @@ WHERE 1=1 and A.Status=0 and class.Status=0 and class.ClassStatus <>4 and b.Or
}
if (demodel.School_Id > 0)
{
builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_Extend.School_Id)} ={demodel.School_Id}");
builder.AppendFormat($@" AND class.{nameof(RB_Order_Guest_Extend.School_Id)} ={demodel.School_Id}");
}
if (demodel.CourseId > 0)
{
builder.AppendFormat($@" AND B.{nameof(RB_Order_Guest_Extend.CourseId)} ={demodel.CourseId}");
builder.AppendFormat($@" AND b.{nameof(RB_Order_Guest_Extend.CourseId)} ={demodel.CourseId}");
}
if (demodel.ClassId > 0)
{
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ 6a883d3d
......@@ -2054,7 +2054,25 @@ namespace Edu.WebApi.Controllers.Course
var OrderId = base.ParmJObj.GetInt("OrderId");
//申请原因
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);
}
#endregion
......
Edu.WebApi/Controllers/EduTask/ChangePlanController.cs
View file @ 6a883d3d
......@@ -50,10 +50,17 @@ namespace Edu.WebApi.Controllers.EduTask
Remarks = base.ParmJObj.GetStringValue("Remarks")
};
var classModel = classModule.GetClassModule(model.ClassId);
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);
//}
if (model.MoveType == 1)
{
model.OldChangePlanItemList = Common.Plugin.JsonHelper.DeserializeObject<List<ChangePlanItem>>(base.ParmJObj.GetStringValue("OldChangePlanItemList"));
......@@ -243,7 +250,7 @@ namespace Edu.WebApi.Controllers.EduTask
}
model.UpdateBy = base.UserInfo.Id;
model.UpdateTime = DateTime.Now;
bool flag = changeClassPlanModule.SetChangeClassPlanModule(model);
bool flag = changeClassPlanModule.SetChangeClassPlanModule(model, receiptFile);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
......
Edu.WebApi/Controllers/EduTask/OrderChangeController.cs
View file @ 6a883d3d
......@@ -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);
}
}
......
Edu.WebApi/Controllers/EduTask/StopStudentClassController.cs
View file @ 6a883d3d
......@@ -50,6 +50,7 @@ namespace Edu.WebApi.Controllers.EduTask
OldStudentStatus= base.ParmJObj.GetInt("OldStudentStatus")
};
var classModel = classModule.GetClassModule(model.ClassId);
string receiptFile = string.Empty;
try
{
string takeEffectTime = base.ParmJObj.GetStringValue("TakeEffectTime");
......@@ -58,12 +59,22 @@ namespace Edu.WebApi.Controllers.EduTask
return ApiResult.Failed("请选择生效日期");
}
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)
{
Common.Plugin.LogHelper.Write(ex, "SetStudentStopClass");
}
if (model.Id == 0)
{
model.CreateBy = base.UserInfo.Id;
......@@ -74,7 +85,7 @@ namespace Edu.WebApi.Controllers.EduTask
model.UpdateBy = base.UserInfo.Id;
model.UpdateTime = DateTime.Now;
model.IsAuditThrough = 0;
bool flag = stopStudentClassModule.SetStudentStopClassModule(model);
bool flag = stopStudentClassModule.SetStudentStopClassModule(model, receiptFile);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
......
Edu.WebApi/Controllers/EduTask/TempInvitationClassController.cs
View file @ 6a883d3d
......@@ -68,7 +68,23 @@ namespace Edu.WebApi.Controllers.EduTask
{
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 });
if (studentTempIvvitationList != null && studentTempIvvitationList.Any())
......@@ -108,7 +124,7 @@ namespace Edu.WebApi.Controllers.EduTask
}
model.UpdateBy = base.UserInfo.Id;
model.UpdateTime = DateTime.Now;
bool flag = tempInvitationClassModule.SetStudentTempInvitationModule(model);
bool flag = tempInvitationClassModule.SetStudentTempInvitationModule(model, receiptFile);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
......
Edu.WebApi/Controllers/Finance/FinanceController.cs
View file @ 6a883d3d
......@@ -1037,6 +1037,7 @@ namespace Edu.WebApi.Controllers.Finance
x.ClassName,
x.ClassNo,
x.StudentName,
x.GuestId,
x.CreateByName,
x.CreateByPhoto,
x.TotalCourseFee,
......
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