Skip to content

E
Education
Commit 1295f77c authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 863c128a 1c79f0ac
Show whitespace changes
Inline Side-by-side
Showing with 202 additions and 207 deletions
Edu.Model/Entity/EduTask/RB_Change_ClassPlan.cs
View file @ 1295f77c
...@@ -76,5 +76,10 @@ namespace Edu.Model.Entity.EduTask ...@@ -76,5 +76,10 @@ namespace Edu.Model.Entity.EduTask
/// 目标数据 /// 目标数据
/// </summary> /// </summary>
public string TargetData { get; set; } public string TargetData { get; set; }
/// <summary>
/// 调课备注
/// </summary>
public string Remarks { get; set; }
} }
} }
Edu.Model/Entity/EduTask/RB_Education_Record.cs
View file @ 1295f77c
...@@ -25,7 +25,7 @@ namespace Edu.Model.Entity.EduTask ...@@ -25,7 +25,7 @@ namespace Edu.Model.Entity.EduTask
/// <summary> /// <summary>
/// 审核id /// 审核id【教务单据审核人员信息表主键编号，RB_Education_Relevance：Id 】
/// </summary> /// </summary>
public int AuditId { get; set; } public int AuditId { get; set; }
...@@ -65,9 +65,5 @@ namespace Edu.Model.Entity.EduTask ...@@ -65,9 +65,5 @@ namespace Edu.Model.Entity.EduTask
public int AuditEmId { get; set; } public int AuditEmId { get; set; }
/// <summary>
/// 审核节点编号
/// </summary>
public int BackrelevanceId { get; set; }
} }
} }
Edu.Model/ViewModel/EduTask/RB_Education_Receipt_ViewModel.cs
View file @ 1295f77c
...@@ -14,5 +14,15 @@ namespace Edu.Model.ViewModel.EduTask ...@@ -14,5 +14,15 @@ namespace Edu.Model.ViewModel.EduTask
/// 是否特殊节点 /// 是否特殊节点
/// </summary> /// </summary>
public int SpecialNode { get; set; } public int SpecialNode { get; set; }
/// <summary>
/// 班级名称
/// </summary>
public string ClassName { get; set; }
/// <summary>
/// 班级编号
/// </summary>
public string ClassNo { get; set; }
} }
} }
Edu.Module.Course/OrderModule.cs
View file @ 1295f77c
...@@ -496,11 +496,11 @@ namespace Edu.Module.Course ...@@ -496,11 +496,11 @@ namespace Edu.Module.Course
{ {
if (demodel.EffectTime < Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now))) if (demodel.EffectTime < Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
{ {
demodel.EffectStatus = 0; demodel.EffectStatus = 1;
} }
else else
{ {
demodel.EffectStatus = 1; demodel.EffectStatus = 0;
} }
} }
else else
......
Edu.Module.Course/StudentBillModule.cs
View file @ 1295f77c
...@@ -128,56 +128,6 @@ namespace Edu.Module.Course ...@@ -128,56 +128,6 @@ namespace Edu.Module.Course
public object GetStuBackInfoModule(int backId) public object GetStuBackInfoModule(int backId)
{ {
var obj = new List<object>(); var obj = new List<object>();
////获取单据实体类
//var backModel = student_BackClassRepository.GetEntity(backId);
////获取审核记录
//var aurList = student_BackRecordRepository.GetStudentBackRecordListRepository(new RB_Student_BackRecord_ViewModel()
//{
// ConditionId = backId,
//});
////审核关联列表
//var arList = student_BackRelevanceRepository.GetStudentBackRelevanceListRepository(new RB_Education_Relevance_ViewModel()
//{
// ConditionId = backId
//});
//obj.Add(new
//{
// NodeName = "制单人",
// AduitStatus = 2,
// AuditWayName = "",
// AduitStatusName = "发起",
// SubList = new List<object>()
// {
// new{
// AduitName= UserReidsCache.GetUserLoginInfo(backModel.CreateBy)?.AccountName ?? "",
// Description=backModel.ApplyReason,
// CreateTime=Common.ConvertHelper.FormatTime(backModel.CreateTime),
// AuditStatus=WFRrocessStatus.AuditThrough,
// AuditStatusName = WFRrocessStatus.AuditThrough.ToName(),
// }
// }
//});
//var existsList = arList.Where(qitem => aurList.Any(oldItem => qitem.Id == oldItem.BackrelevanceId));
//foreach (var item in existsList)
//{
// obj.Add(new
// {
// NodeName = item.AuditDescription,
// AduitStatus = item.Stauts,
// AduitStatusName = GetWFRrocessStatusStrModule(item.Stauts),
// AuditWayName = item.AuditWay != WFTAuditWayEnum.Successively ? item.AuditWay.ToName() : "",
// SubList = aurList.Where(qitem => qitem.AuditId == item.Id).Select(qitem => new
// {
// AduitName = UserReidsCache.GetUserLoginInfo(qitem.AuditEmId)?.AccountName ?? "",
// Description = !string.IsNullOrEmpty(qitem.Description) ? qitem.Description : "无",
// CreateTime = Common.ConvertHelper.FormatTime(qitem.UpdateTime),
// qitem.AuditStatus,
// AuditStatusName = GetWFRrocessStatusStrModule(qitem.AuditStatus),
// })
// });
//}
return obj; return obj;
} }
......
Edu.Module.EduTask/ChangeClassPlanModule.cs
View file @ 1295f77c
...@@ -75,6 +75,7 @@ namespace Edu.Module.EduTask ...@@ -75,6 +75,7 @@ namespace Edu.Module.EduTask
Title="调课申请", Title="调课申请",
ReceiptType= Common.Enum.Finance.ReceiptTypeEnum.ChangeClass, ReceiptType= Common.Enum.Finance.ReceiptTypeEnum.ChangeClass,
RelationId=newId, RelationId=newId,
ClassId=extModel.ClassId,
Group_Id=extModel.Group_Id, Group_Id=extModel.Group_Id,
School_Id=extModel.School_Id, School_Id=extModel.School_Id,
CreateBy=extModel.CreateBy, CreateBy=extModel.CreateBy,
......
Edu.Module.EduTask/EducationReceiptModule.cs
View file @ 1295f77c
...@@ -139,6 +139,10 @@ namespace Edu.Module.EduTask ...@@ -139,6 +139,10 @@ namespace Edu.Module.EduTask
{ {
item.Id, item.Id,
item.Title, item.Title,
item.ClassId,
item.ClassName,
item.ClassNo,
item.OrderId,
item.ReceiptType, item.ReceiptType,
DataObj, DataObj,
item.SpecialNode, item.SpecialNode,
...@@ -154,6 +158,15 @@ namespace Edu.Module.EduTask ...@@ -154,6 +158,15 @@ namespace Edu.Module.EduTask
return result; return result;
} }
[TransactionCallHandler]
public virtual bool EditAuditManModule(int Id)
{
bool flag = false;
return flag;
}
/// <summary> /// <summary>
/// 获取单据详情 /// 获取单据详情
...@@ -205,7 +218,7 @@ namespace Edu.Module.EduTask ...@@ -205,7 +218,7 @@ namespace Edu.Module.EduTask
} }
}); });
var existsList = arList.Where(qitem => aurList.Any(oldItem => qitem.Id == oldItem.BackrelevanceId)); var existsList = arList.Where(qitem => aurList.Any(oldItem => qitem.Id == oldItem.AuditId));
foreach (var item in existsList) foreach (var item in existsList)
{ {
obj.Add(new obj.Add(new
...@@ -299,9 +312,11 @@ namespace Edu.Module.EduTask ...@@ -299,9 +312,11 @@ namespace Edu.Module.EduTask
{ {
model.AuditedId = user.Id.ToString(); model.AuditedId = user.Id.ToString();
} }
#region 更新审核记录表状态 #region 更新审核记录表状态
flag = UpdateEduRecordModule(WFRrocessStatus.AuditNotThrough, auditModel.Description, user.Id, amodel.Id); flag = UpdateEduRecordModule(WFRrocessStatus.AuditNotThrough, auditModel.Description, user.Id, amodel.Id);
#endregion #endregion
#region 更新审核关联表状态 #region 更新审核关联表状态
flag = UpdateEduRelevanceModule(model.Id, model.Stauts, model.AuditedId); flag = UpdateEduRelevanceModule(model.Id, model.Stauts, model.AuditedId);
#endregion #endregion
...@@ -357,6 +372,7 @@ namespace Edu.Module.EduTask ...@@ -357,6 +372,7 @@ namespace Edu.Module.EduTask
message = "尚未匹配到审核相关信息，请联系管理员!"; message = "尚未匹配到审核相关信息，请联系管理员!";
return false; return false;
} }
#region 更新审核记录表状态 #region 更新审核记录表状态
flag = UpdateEduRecordModule(WFRrocessStatus.AuditThrough, auditModel.Description, user.Id, amodel.Id); flag = UpdateEduRecordModule(WFRrocessStatus.AuditThrough, auditModel.Description, user.Id, amodel.Id);
#endregion #endregion
...@@ -374,6 +390,7 @@ namespace Edu.Module.EduTask ...@@ -374,6 +390,7 @@ namespace Edu.Module.EduTask
{ {
model.AuditedId = user.Id.ToString(); model.AuditedId = user.Id.ToString();
} }
#region 更新审核关联表状态 #region 更新审核关联表状态
flag = UpdateEduRelevanceModule(model.Id, model.Stauts, model.AuditedId); flag = UpdateEduRelevanceModule(model.Id, model.Stauts, model.AuditedId);
#endregion #endregion
...@@ -393,6 +410,7 @@ namespace Edu.Module.EduTask ...@@ -393,6 +410,7 @@ namespace Edu.Module.EduTask
{ {
model.AuditedId = user.Id.ToString(); model.AuditedId = user.Id.ToString();
} }
#region 更新审核关联表状态 #region 更新审核关联表状态
flag = UpdateEduRelevanceModule(model.Id, null, model.AuditedId); flag = UpdateEduRelevanceModule(model.Id, null, model.AuditedId);
#endregion #endregion
...@@ -416,6 +434,7 @@ namespace Edu.Module.EduTask ...@@ -416,6 +434,7 @@ namespace Edu.Module.EduTask
{ {
model.AuditedId = user.Id.ToString(); model.AuditedId = user.Id.ToString();
} }
#region 更新审核记录表状态 #region 更新审核记录表状态
flag = UpdateEduRecordModule(WFRrocessStatus.AuditThrough, auditModel.Description, user.Id, amodel.Id); flag = UpdateEduRecordModule(WFRrocessStatus.AuditThrough, auditModel.Description, user.Id, amodel.Id);
#endregion #endregion
...@@ -662,21 +681,19 @@ namespace Edu.Module.EduTask ...@@ -662,21 +681,19 @@ namespace Edu.Module.EduTask
public bool UpdateOtherModule(RB_Education_Receipt receiptModel, EduReceiptAudit auditModel) public bool UpdateOtherModule(RB_Education_Receipt receiptModel, EduReceiptAudit auditModel)
{ {
bool flag = true; bool flag = true;
//退课
if (receiptModel.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.BackClass) if (receiptModel.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.BackClass)
{ {
var backModel = student_BackClassRepository.GetEntity(receiptModel.RelationId);
if (auditModel.AuditStatus == 2) if (auditModel.AuditStatus == 2)
{ {
flag = UpdateStuBackBillStatusModule(BackClassAuditStatusEnum.Pass, auditModel.RecipientIds, backModel, SpecialNode: auditModel.SpecialNode, BackMoney: auditModel.BackMoney); flag = student_BackClassRepository.UpdateStudentBackClassRepository(receiptModel,auditModel);
flag = UpdateOrderGuestStatusModule(2, backModel.StudentId);
} }
if (auditModel.AuditStatus == 3) if (auditModel.AuditStatus == 3)
{ {
flag = UpdateOrderGuestStatusModule(4, backModel.StudentId); flag = student_BackClassRepository.UpdateStudentBackClassRepository(receiptModel, auditModel);
flag = UpdateStuBackBillStatusModule(BackClassAuditStatusEnum.Rejected, auditModel.RecipientIds, backModel, SpecialNode: auditModel.SpecialNode, BackMoney: auditModel.BackMoney);
} }
} }
//调课
if (receiptModel.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass) if (receiptModel.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ChangeClass)
{ {
if (auditModel.AuditStatus == 2) if (auditModel.AuditStatus == 2)
...@@ -687,62 +704,6 @@ namespace Edu.Module.EduTask ...@@ -687,62 +704,6 @@ namespace Edu.Module.EduTask
return flag; return flag;
} }
/// <summary>
/// 更新退课主表状态
/// </summary>
/// <param name="statusEnum">审核状态</param>
/// <param name="newRecipientIds">抄送人</param>
/// <param name="backModel">退课表实体信息</param>
/// <param name="SpecialNode">是否是特殊节点(1-是)</param>
/// <param name="BackMoney">实际退款金额</param>
/// <returns></returns>
private bool UpdateStuBackBillStatusModule(BackClassAuditStatusEnum statusEnum, string newRecipientIds, RB_Student_BackClass backModel, int SpecialNode = 0, decimal BackMoney = 0)
{
Dictionary<string, object> backFileds = new Dictionary<string, object>()
{
{nameof(RB_Student_BackClass_ViewModel.AuditStatus), (int)statusEnum }
};
if (!string.IsNullOrEmpty(newRecipientIds))
{
backFileds.Add(nameof(RB_Student_BackClass_ViewModel.RecipientIds), newRecipientIds);
}
//特殊节点更新时间退课金额
if (SpecialNode == 1)
{
backFileds.Add(nameof(RB_Student_BackClass_ViewModel.RealityBackMoney), BackMoney);
}
bool flag = student_BackClassRepository.Update(backFileds, new WhereHelper(nameof(RB_Student_BackClass_ViewModel.BackId), backModel.BackId));
if (flag)
{
var guestList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { OrderId = backModel.OrderId });
if (guestList != null && guestList.Where(qitem => qitem.GuestState == 2).Count() == guestList.Count())
{
//更新订单为退学状态
Dictionary<string, object> orderFileds = new Dictionary<string, object>()
{
{nameof(RB_Order.OrderState),OrderStateEnum.DropOut }
};
flag = orderRepository.Update(orderFileds, new WhereHelper(nameof(RB_Order.OrderId), backModel.OrderId));
}
}
return flag;
}
/// <summary>
/// 更新学员退课状态
/// </summary>
/// <param name="GuestState"></param>
/// <param name="guestId"></param>
/// <returns></returns>
private bool UpdateOrderGuestStatusModule(int GuestState, int guestId)
{
Dictionary<string, object> guestFileds = new Dictionary<string, object>()
{
{nameof(RB_Order_Guest_ViewModel.GuestState),GuestState }
};
return order_GuestRepository.Update(guestFileds, new WhereHelper(nameof(RB_Order_Guest_ViewModel.Id), guestId));
}
/// <summary> /// <summary>
/// 更新审核记录表信息 /// 更新审核记录表信息
...@@ -881,7 +842,6 @@ namespace Edu.Module.EduTask ...@@ -881,7 +842,6 @@ namespace Edu.Module.EduTask
/// </summary> /// </summary>
/// <param name="empIds">审核人id集合</param> /// <param name="empIds">审核人id集合</param>
/// <param name="wfId">工作流id</param> /// <param name="wfId">工作流id</param>
/// <param name="auditRelevance">审核节点</param> /// <param name="auditRelevance">审核节点</param>
private void InsertBatcheAuditRecord(List<int> empIds, int wfId, RB_Education_Relevance_ViewModel auditRelevance) private void InsertBatcheAuditRecord(List<int> empIds, int wfId, RB_Education_Relevance_ViewModel auditRelevance)
{ {
...@@ -899,7 +859,6 @@ namespace Edu.Module.EduTask ...@@ -899,7 +859,6 @@ namespace Edu.Module.EduTask
UpdateTime = DateTime.Now, UpdateTime = DateTime.Now,
ConditionId = wfId, ConditionId = wfId,
Description = "", Description = "",
BackrelevanceId = auditRelevance.Id
}; };
auditrecordList.Add(auditrecord); auditrecordList.Add(auditrecord);
} }
......
Edu.Repository/Course/RB_ClassRepository.cs
View file @ 1295f77c
...@@ -236,7 +236,8 @@ WHERE 1=1 ...@@ -236,7 +236,8 @@ WHERE 1=1
} }
if (!string.IsNullOrEmpty(query.ClassNo)) if (!string.IsNullOrEmpty(query.ClassNo))
{ {
builder.AppendFormat(" AND A.{0} ='{1}' ", nameof(RB_Class_ViewModel.ClassNo), query.ClassNo); builder.AppendFormat(" AND A.{0} LIKE @ClassNo ", nameof(RB_Class_ViewModel.ClassNo));
parameters.Add("ClassNo", "%" + query.ClassNo.Trim() + "%");
} }
if (!string.IsNullOrWhiteSpace(query.CourseName)) if (!string.IsNullOrWhiteSpace(query.CourseName))
{ {
......
Edu.Repository/Course/RB_Student_BackClassRepository.cs
View file @ 1295f77c
using Edu.Model.Entity.Course; using Edu.Common.Enum.Course;
using Edu.Model.Entity.Course;
using Edu.Model.Entity.EduTask;
using Edu.Model.ViewModel.Course; using Edu.Model.ViewModel.Course;
using Edu.Model.ViewModel.EduTask;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using VT.FW.DB;
using VT.FW.DB.Dapper; using VT.FW.DB.Dapper;
namespace Edu.Repository.Course namespace Edu.Repository.Course
...@@ -13,6 +17,16 @@ namespace Edu.Repository.Course ...@@ -13,6 +17,16 @@ namespace Edu.Repository.Course
/// </summary> /// </summary>
public class RB_Student_BackClassRepository : BaseRepository<RB_Student_BackClass> public class RB_Student_BackClassRepository : BaseRepository<RB_Student_BackClass>
{ {
/// <summary>
/// 订单学员仓储层对象
/// </summary>
private readonly RB_Order_GuestRepository order_GuestRepository = new RB_Order_GuestRepository();
/// <summary>
/// 订单仓储层对象
/// </summary>
private readonly RB_OrderRepository orderRepository = new RB_OrderRepository();
/// <summary> /// <summary>
/// 获取学员退课单据列表 /// 获取学员退课单据列表
/// </summary> /// </summary>
...@@ -62,5 +76,62 @@ WHERE 1=1 "); ...@@ -62,5 +76,62 @@ WHERE 1=1 ");
} }
return result + 1; return result + 1;
} }
/// <summary>
/// 更新退课相关信息
/// </summary>
/// <param name="receiptModel"></param>
/// <param name="auditModel"></param>
/// <returns></returns>
public bool UpdateStudentBackClassRepository(RB_Education_Receipt receiptModel, EduReceiptAudit auditModel)
{
var backModel = base.GetEntity(receiptModel.RelationId);
Dictionary<string, object> backFileds = new Dictionary<string, object>()
{
{nameof(RB_Student_BackClass_ViewModel.AuditStatus),auditModel.AuditStatus }
};
if (!string.IsNullOrEmpty(auditModel.RecipientIds))
{
backFileds.Add(nameof(RB_Student_BackClass_ViewModel.RecipientIds), auditModel.RecipientIds);
}
//特殊节点更新时间退课金额
if (auditModel.SpecialNode == 1)
{
backFileds.Add(nameof(RB_Student_BackClass_ViewModel.RealityBackMoney), auditModel.BackMoney);
}
bool flag = base.Update(backFileds, new WhereHelper(nameof(RB_Student_BackClass_ViewModel.BackId), backModel.BackId));
if (flag)
{
var guestList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { OrderId = backModel.OrderId });
if (guestList != null && guestList.Where(qitem => qitem.GuestState == 2).Count() == guestList.Count())
{
//更新订单为退学状态
Dictionary<string, object> orderFileds = new Dictionary<string, object>()
{
{nameof(RB_Order.OrderState),OrderStateEnum.DropOut }
};
flag = orderRepository.Update(orderFileds, new WhereHelper(nameof(RB_Order.OrderId), backModel.OrderId));
}
}
if (flag)
{
int GuestState = 0;
if (auditModel.AuditStatus == 2)
{
GuestState = 2;
}
if (auditModel.AuditStatus == 3)
{
GuestState = 4;
}
///更新学员退课状态
Dictionary<string, object> guestFileds = new Dictionary<string, object>()
{
{nameof(RB_Order_Guest_ViewModel.GuestState),GuestState }
};
flag = order_GuestRepository.Update(guestFileds, new WhereHelper(nameof(RB_Order_Guest_ViewModel.Id), backModel.GuestId));
}
return flag;
}
} }
} }
\ No newline at end of file
Edu.Repository/EduTask/RB_Change_ClassPlanRepository.cs
View file @ 1295f77c
...@@ -118,24 +118,34 @@ WHERE 1=1 ...@@ -118,24 +118,34 @@ WHERE 1=1
logContent += string.Format("日期由【{0}】修改为【{1}】.", Common.ConvertHelper.FormatDate(item.ClassDate), Common.ConvertHelper.FormatDate(newChangePlanItemModel.ClassDate)); logContent += string.Format("日期由【{0}】修改为【{1}】.", Common.ConvertHelper.FormatDate(item.ClassDate), Common.ConvertHelper.FormatDate(newChangePlanItemModel.ClassDate));
builder.AppendFormat(" update RB_Class_Plan SET ClassDate='{0}' where ClassPlanId ={1};", newChangePlanItemModel.ClassDate, item.ClassPlanId); builder.AppendFormat(" update RB_Class_Plan SET ClassDate='{0}' where ClassPlanId ={1};", newChangePlanItemModel.ClassDate, item.ClassPlanId);
} }
foreach (var itemTime in newChangePlanItemModel.PlanTimeList) foreach (var itemOldTime in item.PlanTimeList)//修改或者删除之前的
{ {
var oldTimeModel = item.PlanTimeList.Where(x => x.ClassTimeId == itemTime.ClassTimeId).FirstOrDefault(); var newTimeModel = newChangePlanItemModel.PlanTimeList.Where(x => x.ClassTimeId > 0 && x.ClassTimeId == itemOldTime.ClassTimeId).FirstOrDefault();//以前与现在都有只是修改了日期
if (oldTimeModel != null && oldTimeModel.ClassTimeId > 0) if (newTimeModel != null && newTimeModel.ClassTimeId > 0)
{ {
if (oldTimeModel.StartTime != itemTime.StartTime) if (newTimeModel.StartTime != itemOldTime.StartTime)
{ {
logContent += string.Format("{0}上课开始时间由【{1}】修改为【{2}】.", Common.ConvertHelper.FormatDate(newChangePlanItemModel.ClassDate), oldTimeModel.StartTime, itemTime.EndTime); logContent += string.Format("{0}上课开始时间由【{1}】修改为【{2}】.", Common.ConvertHelper.FormatDate(newChangePlanItemModel.ClassDate), itemOldTime.StartTime, newTimeModel.EndTime);
} }
if (oldTimeModel.EndTime != itemTime.EndTime) if (newTimeModel.EndTime != itemOldTime.EndTime)
{ {
logContent += string.Format("{0}上课结束时间由【{1}】修改为【{2}】.", Common.ConvertHelper.FormatDate(newChangePlanItemModel.ClassDate), oldTimeModel.EndTime, itemTime.EndTime); logContent += string.Format("{0}上课结束时间由【{1}】修改为【{2}】.", Common.ConvertHelper.FormatDate(newChangePlanItemModel.ClassDate), itemOldTime.EndTime, newTimeModel.EndTime);
} }
if (oldTimeModel.StartTime != itemTime.StartTime || oldTimeModel.EndTime != itemTime.EndTime) if (newTimeModel.StartTime != itemOldTime.StartTime || newTimeModel.EndTime != itemOldTime.EndTime)
{ {
builder.AppendFormat(" update rb_class_time SET StartTime='{0}' ,EndTime='{1}' where ClassTimeId ={2};", itemTime.StartTime, itemTime.EndTime, itemTime.ClassTimeId); builder.AppendFormat(" update rb_class_time SET StartTime='{0}' ,EndTime='{1}' where ClassTimeId ={2};", newTimeModel.StartTime, newTimeModel.EndTime, newTimeModel.ClassTimeId);
} }
} }
else
{
builder.AppendFormat(" DELETE FROM rb_class_time where classtimeId in({0});", itemOldTime.ClassTimeId);
logContent += string.Format("删除{0}上课时间【{1}】-【{2}】.", Common.ConvertHelper.FormatDate(item.ClassDate), itemOldTime.StartTime, itemOldTime.EndTime);
}
}
foreach (var itemNewTime in newChangePlanItemModel.PlanTimeList.Where(x => x.ClassTimeId == 0))//新增上课时间
{
builder.AppendFormat("INSERT into rb_class_time (ClassId,ClassPlanId,StartTime,EndTime,Group_Id,School_Id,ClassStatus)VALUES({0},{1},'{2}','{3}',{4},{5},{6});", model.ClassId, item.ClassPlanId, itemNewTime.StartTime, itemNewTime.EndTime, model.Group_Id, model.School_Id, 0);
logContent += string.Format("{0}新增上课开始时间【{1}】-【{2}】.", Common.ConvertHelper.FormatDate(item.ClassDate), itemNewTime.StartTime, itemNewTime.EndTime);
} }
} }
} }
......
Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs
View file @ 1295f77c
...@@ -62,12 +62,12 @@ namespace Edu.Repository.EduTask ...@@ -62,12 +62,12 @@ namespace Edu.Repository.EduTask
string isSpecNode = ""; string isSpecNode = "";
if (query.Conditon == Common.Enum.Course.EduReceiptConditionEnum.WaitAgree) if (query.Conditon == Common.Enum.Course.EduReceiptConditionEnum.WaitAgree)
{ {
isSpecNode = string.Format(",IFNULL((SELECT SpecialNode FROM rb_Education_relevance WHERE Id IN(SELECT BackrelevanceId FROM rb_education_record WHERE ConditionId=A.Id AND AuditStatus=1 AND AuditEmId={0})),0) AS SpecialNode ", query.CreateBy); isSpecNode = string.Format(",IFNULL((SELECT SpecialNode FROM rb_Education_relevance WHERE Id IN(SELECT AuditId FROM rb_education_record WHERE ConditionId=A.Id AND AuditStatus=1 AND AuditEmId={0})),0) AS SpecialNode ", query.CreateBy);
} }
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.* {0} SELECT A.*,IFNULL(B.ClassName,'') AS ClassName,IFNULL(B.ClassNo,'') AS ClassNo {0}
FROM RB_Education_Receipt AS A FROM RB_Education_Receipt AS A LEFT JOIN rb_class AS B ON A.ClassId=B.ClassId
WHERE 1=1 WHERE 1=1
", isSpecNode); ", isSpecNode);
if (query != null) if (query != null)
...@@ -285,7 +285,6 @@ WHERE 1=1 ...@@ -285,7 +285,6 @@ WHERE 1=1
UpdateBy = model.CreateBy, UpdateBy = model.CreateBy,
UpdateTime = DateTime.Now, UpdateTime = DateTime.Now,
Description = "", Description = "",
BackrelevanceId = levance.Id,
}; };
//系统岗位审核; //系统岗位审核;
if (!string.IsNullOrEmpty(subItem.PostUserIds)) if (!string.IsNullOrEmpty(subItem.PostUserIds))
......
Edu.WebApi/Controllers/EduTask/ChangePlanController.cs
View file @ 1295f77c
...@@ -47,6 +47,7 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -47,6 +47,7 @@ namespace Edu.WebApi.Controllers.EduTask
CourseId = base.ParmJObj.GetInt("CourseId"), CourseId = base.ParmJObj.GetInt("CourseId"),
ChangeType = base.ParmJObj.GetInt("ChangeType"), ChangeType = base.ParmJObj.GetInt("ChangeType"),
MoveType = base.ParmJObj.GetInt("MoveType"), MoveType = base.ParmJObj.GetInt("MoveType"),
Remarks = base.ParmJObj.GetStringValue("Remarks")
}; };
var classModel = classModule.GetClassModule(model.ClassId); var classModel = classModule.GetClassModule(model.ClassId);
try try
...@@ -73,14 +74,6 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -73,14 +74,6 @@ namespace Edu.WebApi.Controllers.EduTask
{ {
return ApiResult.Failed("排课原次数与现有次数不一致"); return ApiResult.Failed("排课原次数与现有次数不一致");
} }
foreach (var item in model.OldChangePlanItemList)
{
var newChangePlanModel = model.NewChangePlanItemList.Where(x => x.ClassPlanId == item.ClassPlanId).FirstOrDefault();
if (item.PlanTimeList.Count() != newChangePlanModel.PlanTimeList.Count())
{
return ApiResult.Failed(item.ClassDate.ToString("yyyy-MM-dd") + "号的排课原课时数与现有课时数不一致");
}
}
} }
else if (model.ChangeType == 2) else if (model.ChangeType == 2)
{ {
......
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