Commit 8b8d100a authored by liudong1993's avatar liudong1993

1

parent a9c08110
...@@ -203,5 +203,16 @@ namespace Edu.Model.Entity.Course ...@@ -203,5 +203,16 @@ namespace Edu.Model.Entity.Course
/// 课时分钟数 /// 课时分钟数
/// </summary> /// </summary>
public int ClassHourMinute { get; set; } public int ClassHourMinute { get; set; }
}
/// <summary>
/// 班级编号
/// </summary>
public string ClassNo { get; set; }
/// <summary>
/// 班级编号 - 字母排序
/// </summary>
public int ClassLetterNum { get; set; }
}
} }
...@@ -62,5 +62,11 @@ namespace Edu.Model.Entity.Course ...@@ -62,5 +62,11 @@ namespace Edu.Model.Entity.Course
/// 删除状态 /// 删除状态
/// </summary> /// </summary>
public DateStateEnum Status { get; set; } public DateStateEnum Status { get; set; }
}
/// <summary>
/// 班级编码前缀
/// </summary>
public string ClassNoPrefix { get; set; }
}
} }
...@@ -97,6 +97,11 @@ namespace Edu.Model.ViewModel.Course ...@@ -97,6 +97,11 @@ namespace Edu.Model.ViewModel.Course
/// </summary> /// </summary>
public string ClassName { get; set; } public string ClassName { get; set; }
/// <summary>
/// 班级编号
/// </summary>
public string ClassNo { get; set; }
/// <summary> /// <summary>
/// 班级类型 /// 班级类型
/// </summary> /// </summary>
......
...@@ -60,6 +60,11 @@ namespace Edu.Model.ViewModel.Course ...@@ -60,6 +60,11 @@ namespace Edu.Model.ViewModel.Course
/// </summary> /// </summary>
public string ClassName { get; set; } public string ClassName { get; set; }
/// <summary>
/// 班级编号
/// </summary>
public string ClassNo { get; set; }
/// <summary> /// <summary>
/// 调整金额 /// 调整金额
/// </summary> /// </summary>
......
...@@ -31,6 +31,11 @@ namespace Edu.Model.ViewModel.Course ...@@ -31,6 +31,11 @@ namespace Edu.Model.ViewModel.Course
/// </summary> /// </summary>
public string ClassName { get; set; } public string ClassName { get; set; }
/// <summary>
/// 班级编号
/// </summary>
public string ClassNo { get; set; }
/// <summary> /// <summary>
/// 代课课时 /// 代课课时
/// </summary> /// </summary>
......
...@@ -38,6 +38,11 @@ namespace Edu.Module.Course ...@@ -38,6 +38,11 @@ namespace Edu.Module.Course
/// </summary> /// </summary>
private readonly RB_Class_TimeRepository class_TimeRepository = new RB_Class_TimeRepository(); private readonly RB_Class_TimeRepository class_TimeRepository = new RB_Class_TimeRepository();
/// <summary>
/// 班级类型
/// </summary>
private readonly RB_Class_TypeRepository class_TypeRepository = new RB_Class_TypeRepository();
/// <summary> /// <summary>
/// 班级价格仓储层对象 /// 班级价格仓储层对象
/// </summary> /// </summary>
...@@ -328,10 +333,66 @@ namespace Edu.Module.Course ...@@ -328,10 +333,66 @@ namespace Edu.Module.Course
{ nameof(RB_Class_ViewModel.StudentNumType),model.StudentNumType}, { nameof(RB_Class_ViewModel.StudentNumType),model.StudentNumType},
{ nameof(RB_Class_ViewModel.ClassHourMinute),model.ClassHourMinute}, { nameof(RB_Class_ViewModel.ClassHourMinute),model.ClassHourMinute},
}; };
if (oldModel.OpenTime != model.OpenTime || oldModel.ClassType != model.ClassType || string.IsNullOrEmpty(oldModel.ClassNo)) {
if (oldModel.OpenTime != model.OpenTime || string.IsNullOrEmpty(oldModel.ClassNo))
{
#region 生成班级号
model.ClassNo = "";
var classTypeModel = class_TypeRepository.GetEntity(model.ClassType);
if (classTypeModel != null)
{
model.ClassNo = classTypeModel.ClassNoPrefix;
}
//查询最大的字母
int CNum = classRepository.GetMaxClassNoPrefix(model.OpenTime.ToString("yyyy-MM-dd"));
if (CNum == 0)
{
model.ClassNo += model.OpenTime.ToString("yyyyMMdd") + "A";
model.ClassLetterNum = 1;
}
else
{
string ClassNoLetterStr = Edu.Common.Config.ClassNoLetterStr;
model.ClassNo += model.OpenTime.ToString("yyyyMMdd") + ClassNoLetterStr.Substring(CNum, 1);
model.ClassLetterNum = CNum + 1;
}
#endregion
fileds.Add(nameof(RB_Class_ViewModel.ClassNo), model.ClassNo);
fileds.Add(nameof(RB_Class_ViewModel.ClassLetterNum), model.ClassLetterNum);
}
else if (oldModel.ClassType != model.ClassType) {
var classTypeModel = class_TypeRepository.GetEntity(model.ClassType);
if (classTypeModel != null)
{
model.ClassNo = classTypeModel.ClassNoPrefix;
}
model.ClassNo += model.OpenTime.ToString("yyyyMMdd") + oldModel.ClassNo.Substring(oldModel.ClassNo.Length - 1, 1);
fileds.Add(nameof(RB_Class_ViewModel.ClassNo), model.ClassNo);
}
}
flag = classRepository.Update(fileds, new WhereHelper(nameof(RB_Class_ViewModel.ClassId), model.ClassId)); flag = classRepository.Update(fileds, new WhereHelper(nameof(RB_Class_ViewModel.ClassId), model.ClassId));
} }
else else
{ {
#region 生成班级号
model.ClassNo = "";
var classTypeModel = class_TypeRepository.GetEntity(model.ClassType);
if (classTypeModel != null) {
model.ClassNo = classTypeModel.ClassNoPrefix;
}
//查询最大的字母
int CNum = classRepository.GetMaxClassNoPrefix(model.OpenTime.ToString("yyyy-MM-dd"));
if (CNum == 0)
{
model.ClassNo += model.OpenTime.ToString("yyyyMMdd") + "A";
model.ClassLetterNum = 1;
}
else {
string ClassNoLetterStr = Edu.Common.Config.ClassNoLetterStr;
model.ClassNo += model.OpenTime.ToString("yyyyMMdd") + ClassNoLetterStr.Substring(CNum, 1);
model.ClassLetterNum = CNum + 1;
}
#endregion
var newId = classRepository.Insert(model); var newId = classRepository.Insert(model);
model.ClassId = newId; model.ClassId = newId;
flag = newId > 0; flag = newId > 0;
...@@ -2609,5 +2670,52 @@ namespace Edu.Module.Course ...@@ -2609,5 +2670,52 @@ namespace Edu.Module.Course
} }
return new { mondayList, tuesdayList, wednesdayList, thursdayList, fridayList, saturdayList, sundayList }; return new { mondayList, tuesdayList, wednesdayList, thursdayList, fridayList, saturdayList, sundayList };
} }
/// <summary>
/// 更新历史班号
/// </summary>
/// <returns></returns>
public bool UpdateHistoryClassNo()
{
var list = classRepository.GetClassListRepository(new RB_Class_ViewModel() { Group_Id = 10000 });
list = list.OrderBy(x => x.OpenTime).ThenBy(x => x.ClassId).ToList();
foreach (var model in list) {
#region 生成班级号
model.ClassNo = "";
var classTypeModel = class_TypeRepository.GetEntity(model.ClassType);
if (classTypeModel != null)
{
model.ClassNo = classTypeModel.ClassNoPrefix;
}
//查询最大的字母
int CNum = classRepository.GetMaxClassNoPrefix(model.OpenTime.ToString("yyyy-MM-dd"));
if (CNum == 0)
{
model.ClassNo += model.OpenTime.ToString("yyyyMMdd") + "A";
model.ClassLetterNum = 1;
}
else
{
string ClassNoLetterStr = Edu.Common.Config.ClassNoLetterStr;
model.ClassNo += model.OpenTime.ToString("yyyyMMdd") + ClassNoLetterStr.Substring(CNum, 1);
model.ClassLetterNum = CNum + 1;
}
#endregion
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Class_ViewModel.ClassNo),model.ClassNo},
{ nameof(RB_Class_ViewModel.ClassLetterNum),model.ClassLetterNum},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Class_ViewModel.ClassId),
FiledValue=model.ClassId,
OperatorEnum=OperatorEnum.Equal
}
};
classRepository.Update(keyValues, wheres);
}
return true;
}
} }
} }
...@@ -2748,6 +2748,7 @@ namespace Edu.Module.Finance ...@@ -2748,6 +2748,7 @@ namespace Edu.Module.Finance
TeacherName = item.TeacherName, TeacherName = item.TeacherName,
ClassId = item.ClassId, ClassId = item.ClassId,
ClassName = item.ClassName, ClassName = item.ClassName,
ClassNo = item.ClassNo,
CouseId = item.CouseId, CouseId = item.CouseId,
CourseName = item.CourseName, CourseName = item.CourseName,
KSNum = KSNum, KSNum = KSNum,
...@@ -2861,6 +2862,7 @@ namespace Edu.Module.Finance ...@@ -2861,6 +2862,7 @@ namespace Edu.Module.Finance
TeacherName = item.TeacherName, TeacherName = item.TeacherName,
ClassId = item.ClassId, ClassId = item.ClassId,
ClassName = item.ClassName, ClassName = item.ClassName,
ClassNo = item.ClassNo,
CouseId = item.CouseId, CouseId = item.CouseId,
CourseName = item.CourseName, CourseName = item.CourseName,
KSNum = KSNum, KSNum = KSNum,
...@@ -2930,6 +2932,7 @@ namespace Edu.Module.Finance ...@@ -2930,6 +2932,7 @@ namespace Edu.Module.Finance
{ {
new ExcelColumn(value: item.Date.ToString("yyyy-MM-dd")){ }, new ExcelColumn(value: item.Date.ToString("yyyy-MM-dd")){ },
new ExcelColumn(value: item.TimeBucket){ }, new ExcelColumn(value: item.TimeBucket){ },
new ExcelColumn(value: item.ClassNo){ },
new ExcelColumn(value: item.ClassName){ }, new ExcelColumn(value: item.ClassName){ },
new ExcelColumn(value: item.CourseName){ }, new ExcelColumn(value: item.CourseName){ },
new ExcelColumn(value: item.TeacherName){ }, new ExcelColumn(value: item.TeacherName){ },
...@@ -2959,6 +2962,7 @@ namespace Edu.Module.Finance ...@@ -2959,6 +2962,7 @@ namespace Edu.Module.Finance
new ExcelColumn(value: ""){ }, new ExcelColumn(value: ""){ },
new ExcelColumn(value: ""){ }, new ExcelColumn(value: ""){ },
new ExcelColumn(value: ""){ }, new ExcelColumn(value: ""){ },
new ExcelColumn(value: ""){ },
new ExcelColumn(value: TKSNum.ToString("#0.00")){ }, new ExcelColumn(value: TKSNum.ToString("#0.00")){ },
new ExcelColumn(value: TDKNum.ToString("#0.00")){ }, new ExcelColumn(value: TDKNum.ToString("#0.00")){ },
new ExcelColumn(value: THours.ToString("#0.00")){ }, new ExcelColumn(value: THours.ToString("#0.00")){ },
...@@ -3022,6 +3026,7 @@ namespace Edu.Module.Finance ...@@ -3022,6 +3026,7 @@ namespace Edu.Module.Finance
item.TeacherName, item.TeacherName,
item.ClassId, item.ClassId,
item.ClassName, item.ClassName,
item.ClassNo,
item.CouseId, item.CouseId,
item.CourseName, item.CourseName,
item.OrderId, item.OrderId,
...@@ -3087,6 +3092,7 @@ namespace Edu.Module.Finance ...@@ -3087,6 +3092,7 @@ namespace Edu.Module.Finance
new ExcelColumn(value: item.ClassDate.ToString("yyyy-MM-dd")){ }, new ExcelColumn(value: item.ClassDate.ToString("yyyy-MM-dd")){ },
new ExcelColumn(value: item.StartDate + "~" + item.EndDate){ }, new ExcelColumn(value: item.StartDate + "~" + item.EndDate){ },
new ExcelColumn(value: item.GuestName){ }, new ExcelColumn(value: item.GuestName){ },
new ExcelColumn(value: item.ClassNo){ },
new ExcelColumn(value: item.ClassName){ }, new ExcelColumn(value: item.ClassName){ },
new ExcelColumn(value: item.CourseName){ }, new ExcelColumn(value: item.CourseName){ },
new ExcelColumn(value: item.TeacherName){ }, new ExcelColumn(value: item.TeacherName){ },
...@@ -3114,6 +3120,7 @@ namespace Edu.Module.Finance ...@@ -3114,6 +3120,7 @@ namespace Edu.Module.Finance
new ExcelColumn(value: ""){ }, new ExcelColumn(value: ""){ },
new ExcelColumn(value: ""){ }, new ExcelColumn(value: ""){ },
new ExcelColumn(value: ""){ }, new ExcelColumn(value: ""){ },
new ExcelColumn(value: ""){ },
new ExcelColumn(value: TcdHours.ToString("#0.00")){ }, new ExcelColumn(value: TcdHours.ToString("#0.00")){ },
new ExcelColumn(value: ""){ }, new ExcelColumn(value: ""){ },
new ExcelColumn(value: TPrice.ToString("#0.00")){ }, new ExcelColumn(value: TPrice.ToString("#0.00")){ },
......
...@@ -160,6 +160,7 @@ namespace Edu.Module.Public ...@@ -160,6 +160,7 @@ namespace Edu.Module.Public
{nameof(RB_Class_Type_ViewModel.CTypeName),extModel.CTypeName}, {nameof(RB_Class_Type_ViewModel.CTypeName),extModel.CTypeName},
{nameof(RB_Class_Type_ViewModel.AddHourFee),extModel.AddHourFee}, {nameof(RB_Class_Type_ViewModel.AddHourFee),extModel.AddHourFee},
{nameof(RB_Class_Type_ViewModel.DefaultClassNum),extModel.DefaultClassNum}, {nameof(RB_Class_Type_ViewModel.DefaultClassNum),extModel.DefaultClassNum},
{nameof(RB_Class_Type_ViewModel.ClassNoPrefix),extModel.ClassNoPrefix},
{nameof(RB_Class_Type_ViewModel.UpdateBy),extModel.UpdateBy}, {nameof(RB_Class_Type_ViewModel.UpdateBy),extModel.UpdateBy},
{nameof(RB_Class_Type_ViewModel.UpdateTime),extModel.UpdateTime}, {nameof(RB_Class_Type_ViewModel.UpdateTime),extModel.UpdateTime},
}; };
......
...@@ -482,5 +482,17 @@ where a.`Status`=0 and a.IsSubscribe=1 and ClassStatus in(1,2)"); ...@@ -482,5 +482,17 @@ where a.`Status`=0 and a.IsSubscribe=1 and ClassStatus in(1,2)");
builder.AppendFormat(" GROUP BY a.CourseClassType,a.StudentNumType "); builder.AppendFormat(" GROUP BY a.CourseClassType,a.StudentNumType ");
return Get<RB_Class_ViewModel>(builder.ToString(), parameters).ToList(); return Get<RB_Class_ViewModel>(builder.ToString(), parameters).ToList();
} }
/// <summary>
/// 获取班级编码
/// </summary>
/// <param name="OpenTime"></param>
/// <returns></returns>
public int GetMaxClassNoPrefix(string OpenTime)
{
string sql = $@"select Max(ClassLetterNum) as ClassLetterNum from RB_Class where Status =0 and OpenTime ='{OpenTime}'";
var obj = ExecuteScalar(sql);
return obj == null ? 0 : Convert.ToInt32(obj);
}
} }
} }
\ No newline at end of file
...@@ -438,7 +438,7 @@ GROUP BY tt.TeacherId,tt.OrderGuestId ...@@ -438,7 +438,7 @@ GROUP BY tt.TeacherId,tt.OrderGuestId
} }
string sql = $@" string sql = $@"
SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,c.ClassName,co.CourseName,p.ClassId,c.ClassType,c.ClassHourMinute,c.CouseId,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate FROM rb_class_check p SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,c.ClassName,co.CourseName,p.ClassId,c.ClassType,c.ClassNo,c.ClassHourMinute,c.CouseId,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate FROM rb_class_check p
INNER JOIN rb_class_time t on p.ClassTimeId = t.ClassTimeId INNER JOIN rb_class_time t on p.ClassTimeId = t.ClassTimeId
LEFT JOIN rb_teacher t2 on p.TeacherId = t2.TId LEFT JOIN rb_teacher t2 on p.TeacherId = t2.TId
LEFT JOIN rb_class c on p.ClassId = c.ClassId LEFT JOIN rb_class c on p.ClassId = c.ClassId
...@@ -476,7 +476,7 @@ ORDER BY p.ClassDate ASC ...@@ -476,7 +476,7 @@ ORDER BY p.ClassDate ASC
} }
string sql = $@" string sql = $@"
SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,c.ClassName,co.CourseName,p.ClassId,c.ClassType,c.ClassHourMinute,c.CouseId,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate FROM rb_class_check p SELECT p.TeacherId,t2.TeacherName,t2.BaseHourFee,c.ClassName,co.CourseName,p.ClassId,c.ClassType,c.ClassNo,c.ClassHourMinute,c.CouseId,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate FROM rb_class_check p
INNER JOIN rb_class_time t on p.ClassTimeId = t.ClassTimeId INNER JOIN rb_class_time t on p.ClassTimeId = t.ClassTimeId
LEFT JOIN rb_teacher t2 on p.TeacherId = t2.TId LEFT JOIN rb_teacher t2 on p.TeacherId = t2.TId
LEFT JOIN rb_class c on p.ClassId = c.ClassId LEFT JOIN rb_class c on p.ClassId = c.ClassId
...@@ -538,7 +538,7 @@ case when tt.ClassHours>0 and tt.TotalSub >0 then ...@@ -538,7 +538,7 @@ case when tt.ClassHours>0 and tt.TotalSub >0 then
(tt.CourseFee - tt.DiscountMoney / tt.TotalSub * tt.CourseFee) /tt.ClassHours (tt.CourseFee - tt.DiscountMoney / tt.TotalSub * tt.CourseFee) /tt.ClassHours
else 0 END AS UnitPrice else 0 END AS UnitPrice
FROM ( FROM (
SELECT p.OrderGuestId,p.CurrentDeductionHours,t2.GuestName,p.TeacherId,t3.TeacherName,t2.OrderId,ec.ContractNo,c.ClassName,co.CourseName,p.ClassId,c.CouseId SELECT p.OrderGuestId,p.CurrentDeductionHours,t2.GuestName,p.TeacherId,t3.TeacherName,t2.OrderId,ec.ContractNo,c.ClassName,c.ClassNo,co.CourseName,p.ClassId,c.CouseId
,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate,o.EnterID,o.HelpEnterId ,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate,o.EnterID,o.HelpEnterId
,ec.FirstCourseFee + ec.SecondCourseFee + ec.ThirdCourseFee as CourseFee ,ec.FirstCourseFee + ec.SecondCourseFee + ec.ThirdCourseFee as CourseFee
,ec.FirstDiscountMoney + ec.SecondDiscountMoney + ec.ThirdDiscountMoney as DiscountMoney ,ec.FirstDiscountMoney + ec.SecondDiscountMoney + ec.ThirdDiscountMoney as DiscountMoney
...@@ -608,7 +608,7 @@ case when tt.ClassHours>0 and tt.TotalSub >0 then ...@@ -608,7 +608,7 @@ case when tt.ClassHours>0 and tt.TotalSub >0 then
(tt.CourseFee - tt.DiscountMoney / tt.TotalSub * tt.CourseFee) /tt.ClassHours (tt.CourseFee - tt.DiscountMoney / tt.TotalSub * tt.CourseFee) /tt.ClassHours
else 0 END AS UnitPrice else 0 END AS UnitPrice
FROM ( FROM (
SELECT p.OrderGuestId,p.CurrentDeductionHours,t2.GuestName,p.TeacherId,t3.TeacherName,t2.OrderId,ec.ContractNo,c.ClassName,co.CourseName,p.ClassId,c.CouseId SELECT p.OrderGuestId,p.CurrentDeductionHours,t2.GuestName,p.TeacherId,t3.TeacherName,t2.OrderId,ec.ContractNo,c.ClassName,c.ClassNo,co.CourseName,p.ClassId,c.CouseId
,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate,o.EnterID,o.HelpEnterId ,p.ClassDate,p.ClassTimeId,t.StartTime as StartDate,t.EndTime as EndDate,o.EnterID,o.HelpEnterId
,ec.FirstCourseFee + ec.SecondCourseFee + ec.ThirdCourseFee as CourseFee ,ec.FirstCourseFee + ec.SecondCourseFee + ec.ThirdCourseFee as CourseFee
,ec.FirstDiscountMoney + ec.SecondDiscountMoney + ec.ThirdDiscountMoney as DiscountMoney ,ec.FirstDiscountMoney + ec.SecondDiscountMoney + ec.ThirdDiscountMoney as DiscountMoney
......
...@@ -237,7 +237,7 @@ namespace Edu.Repository.Course ...@@ -237,7 +237,7 @@ namespace Edu.Repository.Course
where += $@" AND o.CreateTime <='{demodel.EndTime} 23:59:59'"; where += $@" AND o.CreateTime <='{demodel.EndTime} 23:59:59'";
} }
string sql = $@" SELECT c.*,c1.ClassName,ca.AdjustPrice FROM RB_Education_Contract c string sql = $@" SELECT c.*,c1.ClassName,c1.ClassNo,ca.AdjustPrice FROM RB_Education_Contract c
left join RB_Education_ContractAdjust ca on c.Id = ca.ContractId left join RB_Education_ContractAdjust ca on c.Id = ca.ContractId
left join rb_order o on c.OrderId = o.OrderId left join rb_order o on c.OrderId = o.OrderId
left join rb_class c1 on o.ClassId = c1.ClassId left join rb_class c1 on o.ClassId = c1.ClassId
......
...@@ -77,6 +77,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -77,6 +77,7 @@ namespace Edu.WebApi.Controllers.Course
item.ClassStatus, item.ClassStatus,
item.Status, item.Status,
item.OtherCourseList, item.OtherCourseList,
item.ClassNo
}); });
} }
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
......
...@@ -1018,6 +1018,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -1018,6 +1018,7 @@ namespace Edu.WebApi.Controllers.Finance
x.ContractNo, x.ContractNo,
x.CourseName, x.CourseName,
x.ClassName, x.ClassName,
x.ClassNo,
x.StudentName, x.StudentName,
x.CreateByName, x.CreateByName,
x.CreateByPhoto, x.CreateByPhoto,
...@@ -1108,7 +1109,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -1108,7 +1109,7 @@ namespace Edu.WebApi.Controllers.Finance
ExcelDataSource headerTop = new ExcelDataSource() ExcelDataSource headerTop = new ExcelDataSource()
{ {
ExcelRows = new List<ExcelColumn>(30) { ExcelRows = new List<ExcelColumn>(30) {
new ExcelColumn(value:"合同信息"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER,Colspan=15 }, new ExcelColumn(value:"合同信息"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER,Colspan=16 },
new ExcelColumn(value:"收款信息"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER,Colspan = 6 }, new ExcelColumn(value:"收款信息"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER,Colspan = 6 },
new ExcelColumn(value:"合同有效金额"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER, Colspan = 2 }, new ExcelColumn(value:"合同有效金额"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER, Colspan = 2 },
new ExcelColumn(value:"消费情况"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER , Colspan = 7}, new ExcelColumn(value:"消费情况"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER , Colspan = 7},
...@@ -1124,6 +1125,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -1124,6 +1125,7 @@ namespace Edu.WebApi.Controllers.Finance
new ExcelColumn(value:"合同号"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"合同号"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"合同状态"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"合同状态"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"产品名称"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"产品名称"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"班号"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"班级"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"班级"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"学员名字"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"学员名字"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"业务人员"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"业务人员"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
...@@ -1204,6 +1206,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -1204,6 +1206,7 @@ namespace Edu.WebApi.Controllers.Finance
new ExcelColumn(value: item.ContractNo){ Rowspan = Count }, new ExcelColumn(value: item.ContractNo){ Rowspan = Count },
new ExcelColumn(value: StatusName){ Rowspan = Count }, new ExcelColumn(value: StatusName){ Rowspan = Count },
new ExcelColumn(value: item.CourseName){ Rowspan = Count }, new ExcelColumn(value: item.CourseName){ Rowspan = Count },
new ExcelColumn(value: item.ClassNo){ Rowspan = Count },
new ExcelColumn(value: item.ClassName){ Rowspan = Count }, new ExcelColumn(value: item.ClassName){ Rowspan = Count },
new ExcelColumn(value: item.StudentName){ Rowspan = Count }, new ExcelColumn(value: item.StudentName){ Rowspan = Count },
new ExcelColumn(value: item.CreateByName){ Rowspan = Count }, new ExcelColumn(value: item.CreateByName){ Rowspan = Count },
...@@ -1241,6 +1244,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -1241,6 +1244,7 @@ namespace Edu.WebApi.Controllers.Finance
{ {
ExcelRows = new List<ExcelColumn>() ExcelRows = new List<ExcelColumn>()
{ {
new ExcelColumn(value: ""){ },
new ExcelColumn(value: ""){ }, new ExcelColumn(value: ""){ },
new ExcelColumn(value: ""){ }, new ExcelColumn(value: ""){ },
new ExcelColumn(value: ""){ }, new ExcelColumn(value: ""){ },
...@@ -1291,6 +1295,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -1291,6 +1295,7 @@ namespace Edu.WebApi.Controllers.Finance
new ExcelColumn(value: item.ContractNo){ }, new ExcelColumn(value: item.ContractNo){ },
new ExcelColumn(value: StatusName){ }, new ExcelColumn(value: StatusName){ },
new ExcelColumn(value: item.CourseName){ }, new ExcelColumn(value: item.CourseName){ },
new ExcelColumn(value: item.ClassNo){ },
new ExcelColumn(value: item.ClassName){ }, new ExcelColumn(value: item.ClassName){ },
new ExcelColumn(value: item.StudentName){ }, new ExcelColumn(value: item.StudentName){ },
new ExcelColumn(value: item.CreateByName){ }, new ExcelColumn(value: item.CreateByName){ },
...@@ -1576,6 +1581,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -1576,6 +1581,7 @@ namespace Edu.WebApi.Controllers.Finance
x.TeacherName, x.TeacherName,
x.ClassId, x.ClassId,
x.ClassName, x.ClassName,
x.ClassNo,
x.CouseId, x.CouseId,
x.CourseName, x.CourseName,
x.KSNum, x.KSNum,
...@@ -1602,6 +1608,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -1602,6 +1608,7 @@ namespace Edu.WebApi.Controllers.Finance
ExcelRows = new List<ExcelColumn>(30) { ExcelRows = new List<ExcelColumn>(30) {
new ExcelColumn(value:"上课日期"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"上课日期"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"上课时间段"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"上课时间段"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"班级编号"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"班级"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"班级"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"课程"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"课程"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"老师名称"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"老师名称"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
...@@ -1722,6 +1729,7 @@ namespace Edu.WebApi.Controllers.Finance ...@@ -1722,6 +1729,7 @@ namespace Edu.WebApi.Controllers.Finance
new ExcelColumn(value:"上课日期"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"上课日期"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"上课时间段"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"上课时间段"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"学生名字"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"学生名字"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"班级编号"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"班级"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"班级"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"课程"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"课程"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
new ExcelColumn(value:"老师名称"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER }, new ExcelColumn(value:"老师名称"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
......
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