Skip to content

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

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

parents 6c91c2f0 5971a274
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 899 additions and 22 deletions
Edu.Model/Entity/Course/RB_Class_Finance.cs 0 → 100644
View file @ e69115bd
using System;
using System.Collections.Generic;
using System.Text;
using Edu.Common.Enum;
using VT.FW.DB;
namespace Edu.Model.Entity.Course
{
/// <summary>
/// 班级实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Class_Finance
{
/// <summary>
/// 编号
/// </summary>
public int FinanceId { get; set; }
/// <summary>
/// 班级编号
/// </summary>
public int ClassId { get; set; }
/// <summary>
/// 删除状态
/// </summary>
public DateStateEnum Status { get; set; }
/// <summary>
/// 是否开启班级收支 0-是，1-否
/// </summary>
public int IsOpen { 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; }
}
}
Edu.Model/ViewModel/Course/RB_Class_Finance_ViewModel.cs 0 → 100644
View file @ e69115bd
using System;
using System.Collections.Generic;
using System.Text;
using Edu.Model.Entity.Course;
namespace Edu.Model.ViewModel.Course
{
/// <summary>
/// 班级收支实体表
/// </summary>
[Serializable]
public class RB_Class_Finance_ViewModel: RB_Class_Finance
{
/// <summary>
/// 创建人
/// </summary>
public string CreateByName { get; set; }
/// <summary>
/// 修改人
/// </summary>
public string UpdateByName { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateTime); } }
/// <summary>
/// 更新时间
/// </summary>
public string UpdateTimeStr { get { return Common.ConvertHelper.FormatTime(this.UpdateTime); } }
}
}
Edu.Model/ViewModel/Finance/RB_Finance_Extend.cs
View file @ e69115bd
......@@ -727,5 +727,9 @@ namespace Edu.Model.ViewModel.Finance
/// 审批日期
/// </summary>
public DateTime? AuditDate { get; set; }
/// <summary>
/// 审批人ID
/// </summary>
public string AuditEmName { get; set; }
}
}
Edu.Module.Course/ClassModule.cs
View file @ e69115bd
......@@ -76,6 +76,13 @@ namespace Edu.Module.Course
/// </summary>
private readonly RB_TeacherRepository teacherRepository = new RB_TeacherRepository();
/// <summary>
/// 开启班级收支仓储层对象
/// </summary>
private readonly RB_Class_FinanceRepository classFinanceRepository = new RB_Class_FinanceRepository();
/// <summary>
/// 获取班级列表
/// </summary>
......@@ -87,7 +94,18 @@ namespace Edu.Module.Course
}
/// <summary>
/// 获取班级课程名称以及老师信息列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Class_ViewModel> GetClassAndCourseListRepository(RB_Class_ViewModel query)
{
return classRepository.GetClassAndCourseListRepository(query);
}
/// <summary>
/// 获取班级上课时间列表
......@@ -568,9 +586,9 @@ namespace Edu.Module.Course
{
extModel.DefaultTimeList = Common.Plugin.JsonHelper.DeserializeObject<List<RB_Class_Time_ViewModel>>(extModel.DefaultTimeJson);
}
if (!string.IsNullOrEmpty(extModel.DateJson) && extModel.ClassStyle!= Common.Enum.Course.ClassStyleEnum.OnLine)
{
extModel.WeekDayList= Common.Plugin.JsonHelper.DeserializeObject<List<string>>(extModel.DateJson);
if (!string.IsNullOrEmpty(extModel.DateJson) && extModel.ClassStyle != Common.Enum.Course.ClassStyleEnum.OnLine)
{
extModel.WeekDayList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(extModel.DateJson);
}
}
return extModel;
......@@ -678,7 +696,7 @@ namespace Edu.Module.Course
/// <param name="extModel"></param>
/// <param name="createBy">操作人</param>
/// <returns></returns>
public virtual bool SetClassPlanModule(RB_Class_Plan_ViewModel extModel,int createBy)
public virtual bool SetClassPlanModule(RB_Class_Plan_ViewModel extModel, int createBy)
{
bool flag;
string logContent = "";
......@@ -691,7 +709,7 @@ namespace Edu.Module.Course
{nameof(RB_Class_Plan_ViewModel.TeacherId),extModel.TeacherId },
{nameof(RB_Class_Plan_ViewModel.ClassDate),extModel.ClassDate },
};
if (oldPlanModel.ClassRoomId != extModel.ClassRoomId)
{
string roomIds = oldPlanModel.ClassRoomId + "," + extModel.ClassRoomId;
......@@ -704,7 +722,7 @@ namespace Edu.Module.Course
if (oldPlanModel.TeacherId != extModel.TeacherId)
{
string tIds = oldPlanModel.TeacherId + "," + extModel.TeacherId;
var teacherList = teacherRepository.GetTeacherListRepository(new RB_Teacher_ViewModel() {QTIds=tIds});
var teacherList = teacherRepository.GetTeacherListRepository(new RB_Teacher_ViewModel() { QTIds = tIds });
logContent += string.Format(",讲师由【{0}】修改为【{1}】.",
(teacherList?.Where(qitem => qitem.TId == oldPlanModel.TeacherId)?.FirstOrDefault()?.TeacherName ?? ""),
(teacherList?.Where(qitem => qitem.TId == extModel.TeacherId)?.FirstOrDefault()?.TeacherName ?? "")
......@@ -712,9 +730,9 @@ namespace Edu.Module.Course
}
if (oldPlanModel.ClassDate != extModel.ClassDate)
{
logContent += string.Format(",日期由【{0}】修改为【{1}】.", Common.ConvertHelper.FormatDate(oldPlanModel.ClassDate), Common.ConvertHelper.FormatDate(extModel.ClassDate));
logContent += string.Format(",日期由【{0}】修改为【{1}】.", Common.ConvertHelper.FormatDate(oldPlanModel.ClassDate), Common.ConvertHelper.FormatDate(extModel.ClassDate));
}
flag = class_PlanRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Plan_ViewModel.ClassPlanId), extModel.ClassPlanId));
}
else
......@@ -757,7 +775,7 @@ namespace Edu.Module.Course
{
if (dItem.ClassTimeId > 0)
{
logContent += string.Format(",删除{0}上课时间【{1} - {2}】", Common.ConvertHelper.FormatDate(extModel.ClassDate),dItem.StartTime, dItem.EndTime);
logContent += string.Format(",删除{0}上课时间【{1} - {2}】", Common.ConvertHelper.FormatDate(extModel.ClassDate), dItem.StartTime, dItem.EndTime);
class_TimeRepository.Delete(dItem.ClassTimeId);
}
}
......@@ -1004,5 +1022,44 @@ namespace Edu.Module.Course
return studentRepository.GetStudentListRepository(query);
}
#region 班级收支信息
/// <summary>
/// 获取班级收支信息列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Class_Finance_ViewModel> GetClassFinanceListRepository(RB_Class_Finance_ViewModel query)
{
return classFinanceRepository.GetClassFinanceListRepository(query);
}
/// <summary>
/// 新增/修改班级收支设置
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool SetClassFinance(RB_Class_Finance_ViewModel model)
{
var oldModel = GetClassFinanceListRepository(model).FirstOrDefault();
if (oldModel == null || oldModel.FinanceId == 0)
{
return classFinanceRepository.Insert(model) > 0;
}
else
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Class_Finance_ViewModel.IsOpen),model.IsOpen},
{nameof(RB_Class_Finance_ViewModel.UpdateBy),model.UpdateBy},
{nameof(RB_Class_Finance_ViewModel.UpdateTime),model.UpdateTime}
};
return order_GuestRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Finance_ViewModel.FinanceId), oldModel.FinanceId));
}
}
#endregion
}
}
Edu.Module.Course/OrderModule.cs
View file @ e69115bd
......@@ -880,6 +880,40 @@ namespace Edu.Module.Course
}
}
/// <summary>
/// 获取班级订单列表
/// </summary>
/// <param name="classId"></param>
/// <param name="groupId"></param>
/// <returns></returns>
public List<RB_Order_ViewModel> GetClassOrderList_V2(int classId, int groupId)
{
var cModel = classRepository.GetEntity(classId);
//获取订单列表
var orderList = orderRepository.GetList(new RB_Order_ViewModel() { Group_Id = groupId, ClassId = classId });
//if (orderList.Any())
//{
// string orderIds = string.Join(",", orderList.Select(x => x.OrderId));
// //获取备注列表
// var remarkList = order_RemarkRepository.GetList(new RB_Order_Remark_ViewModel() { }, orderIds);
// //获取名单列表
// var guestList = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel() { OrderIds = orderIds });
// foreach (var item in orderList)
// {
// item.SaleRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 1).ToList();
// item.TeacherRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 2).ToList();
// item.RectorRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 3).ToList();
// item.DirectorRemarkList = remarkList.Where(x => x.OrderId == item.OrderId && x.Type == 4).ToList();
// item.GuestList = guestList.Where(x => x.OrderId == item.OrderId).ToList();
// }
//}
return orderList;
}
#endregion
#region 学生名单
......
Edu.Module.Finance/FinanceModule.cs
View file @ e69115bd
......@@ -60,7 +60,7 @@ namespace Edu.Module.Finance
}
walist = Finance_TemplateRepository.GetAgreeOrWaitList(new Rb_Workflow_Auditrecord() { AuditStatus = WFRrocessStatus.NotAudit }, fridStr);
// tclist = GetTCIDANDTCNUMForBatch(list.Select(x => x.FrID).ToList());
// tclist = GetTCIDANDTCNUMForBatch(list.Select(x => x.FrID).ToList());
volist = voucherRepository.GetList(new RB_Voucher_Extend() { FrIdStr = fridStr });
}
......@@ -86,7 +86,8 @@ namespace Edu.Module.Finance
AuditInfo auditInfo = new AuditInfo()
{
AuditEmId = sitem.AuditEmId,
AuditDate = null
AuditDate = null,
AuditEmName = sitem.AuditEmIdName
};
item.AuditList.Add(auditInfo);
}
......
Edu.Repository/Course/RB_ClassRepository.cs
View file @ e69115bd
......@@ -38,10 +38,7 @@ WHERE 1=1
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Group_Id), query.Group_Id);
}
if (query.CouseId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.CouseId), query.CouseId);
}
if (query.ClassId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassId), query.ClassId);
......@@ -54,6 +51,68 @@ WHERE 1=1
return Get<RB_Class_ViewModel>(builder.ToString()).ToList();
}
/// <summary>
/// 获取班级课程名称以及老师信息列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Class_ViewModel> GetClassAndCourseListRepository(RB_Class_ViewModel query)
{
var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,B.CourseName,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead
FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId
WHERE 1=1
");
if (query != null)
{
if (query.Group_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Group_Id), query.Group_Id);
}
if (query.School_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.School_Id), query.School_Id);
}
if (query.ClassId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassId), query.ClassId);
}
if (query.Status >= 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Status), (int)query.Status);
}
if (query.ClassStatus > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassStatus), (int)query.ClassStatus);
}
if (!string.IsNullOrWhiteSpace(query.ClassName))
{
builder.AppendFormat(" AND A.{0} LIKE @ClassName ", nameof(RB_Class_ViewModel.ClassName));
parameters.Add("ClassName", "%" + query.ClassName.Trim() + "%");
}
if (!string.IsNullOrWhiteSpace(query.CourseName))
{
builder.AppendFormat(" AND B.{0} LIKE @CourseName ", nameof(RB_Class_ViewModel.CourseName));
parameters.Add("CourseName", "%" + query.CourseName.Trim() + "%");
}
if (!string.IsNullOrWhiteSpace(query.TeacherName))
{
builder.AppendFormat(" AND D.{0} LIKE @TeacherName ", nameof(RB_Class_ViewModel.TeacherName));
parameters.Add("TeacherName", "%" + query.TeacherName.Trim() + "%");
}
}
return Get<RB_Class_ViewModel>(builder.ToString(), parameters).ToList();
}
/// <summary>
/// 获取班级分页列表
/// </summary>
......@@ -79,13 +138,13 @@ WHERE 1=1
{
if (query.Group_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Group_Id),query.Group_Id);
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Group_Id), query.Group_Id);
}
if (query.School_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.School_Id), query.School_Id);
}
if (query.Status >=0 )
if (query.Status >= 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Status), (int)query.Status);
}
......@@ -114,7 +173,7 @@ WHERE 1=1
parameters.Add("TeacherName", "%" + query.TeacherName.Trim() + "%");
}
}
return GetPage<RB_Class_ViewModel>(pageIndex,pageSize,out rowsCount,builder.ToString(),parameters).ToList();
return GetPage<RB_Class_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
}
/// <summary>
......@@ -199,7 +258,7 @@ WHERE 1=1
builder.AppendFormat(" AND D.{0} LIKE @TeacherName ", nameof(RB_Class_ViewModel.TeacherName));
parameters.Add("TeacherName", "%" + query.TeacherName.Trim() + "%");
}
if (!string.IsNullOrEmpty(query.StartTime))
if (!string.IsNullOrEmpty(query.StartTime))
{
builder.AppendFormat(" AND A.{0} >='{1}' ", nameof(RB_Class_ViewModel.OpenTime), query.StartTime);
}
......@@ -236,7 +295,7 @@ FROM (
FROM rb_class WHERE `Status`=0 AND ClassStatus=3 AND ClassType IN({0})
GROUP BY ClassType
) AS B ON A.ClassType=B.ClassType
",qClassTypeIds);
", qClassTypeIds);
return Get<ClassTypeStatic_ViewModel>(builder.ToString()).ToList();
}
}
......
Edu.Repository/Course/RB_Class_FinanceRepository.cs 0 → 100644
View file @ e69115bd
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Edu.Common.Enum;
using Edu.Model.Entity.Course;
using Edu.Model.ViewModel.Course;
namespace Edu.Repository.Course
{
public class RB_Class_FinanceRepository : BaseRepository<RB_Class_Finance>
{
/// <summary>
/// 获取班级收支信息列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Class_Finance_ViewModel> GetClassFinanceListRepository(RB_Class_Finance_ViewModel query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*
FROM RB_Class_Finance AS A
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Finance_ViewModel.Status), (int)DateStateEnum.Normal);
if (query != null)
{
if (query.Group_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Finance_ViewModel.Group_Id), query.Group_Id);
}
if (query.School_Id > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Finance_ViewModel.School_Id), query.School_Id);
}
if (query.ClassId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Finance_ViewModel.ClassId), query.ClassId);
}
}
return Get<RB_Class_Finance_ViewModel>(builder.ToString()).ToList();
}
}
}
Edu.Repository/Finance/RB_FinanceRepository.cs
View file @ e69115bd
......@@ -7,7 +7,7 @@ using Edu.Model.ViewModel.Finance;
namespace Edu.Repository.Finance
{
public class RB_FinanceRepository:BaseRepository<RB_Finance>
public class RB_FinanceRepository : BaseRepository<RB_Finance>
{
/// <summary>
......@@ -86,6 +86,10 @@ namespace Edu.Repository.Finance
{
where += string.Format(" AND A." + nameof(RB_Finance.Type) + " ={0}", (int)model.Type);
}
if (model.FinanceType.HasValue && model.FinanceType > 0)
{
where += string.Format(" AND A." + nameof(RB_Finance.FinanceType) + " ={0}", model.FinanceType);
}
if (model.Status > 0)
{
where += string.Format(" AND A." + nameof(RB_Finance.Status) + " ={0}", (int)model.Status);
......
Edu.WebApi/Controllers/Finance/FinanceController.cs 0 → 100644
View file @ e69115bd
This diff is collapsed.
Edu.WebApi/Edu.WebApi.csproj
View file @ e69115bd
......@@ -26,6 +26,7 @@
<ProjectReference Include="..\Edu.Common\Edu.Common.csproj" />
<ProjectReference Include="..\Edu.Model\Edu.Model.csproj" />
<ProjectReference Include="..\Edu.Module.Course\Edu.Module.Course.csproj" />
<ProjectReference Include="..\Edu.Module.Finance\Edu.Module.Finance.csproj" />
<ProjectReference Include="..\Edu.Module.Public\Edu.Module.Public.csproj" />
<ProjectReference Include="..\Edu.Module.Question\Edu.Module.Question.csproj" />
<ProjectReference Include="..\Edu.Module.System\Edu.Module.System.csproj" />
......
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