Skip to content

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

页面修改

parent 336ef632
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 67 deletions
Edu.Common/Enum/Course/CourseRateEnum.cs
View file @ 18ac5b63
......@@ -65,37 +65,4 @@ namespace Edu.Common.Enum.Course
[EnumField("其他")]
OTHER = 9,
}
/// <summary>
/// 所属科目
/// </summary>
public enum CourseSubjectEnum
{
/// <summary>
/// 日语
/// </summary>
[EnumField("日语")]
Japanese = 1,
/// <summary>
/// 韩语
/// </summary>
[EnumField("韩语")]
Korean =2,
/// <summary>
/// 新媒体运营
/// </summary>
[EnumField("新媒体运营")]
NewMediaOperation = 3,
/// <summary>
/// 智能工业
/// </summary>
[EnumField("智能工业")]
Robot = 4
}
}
Edu.Model/Entity/Course/RB_Course.cs
View file @ 18ac5b63
......@@ -145,6 +145,6 @@ namespace Edu.Model.Entity.Course
/// <summary>
/// 所属科目
/// </summary>
public CourseSubjectEnum CourseSubject { get; set; }
public int CourseSubject { get; set; }
}
}
\ No newline at end of file
Edu.Model/Entity/Course/RB_Course_Category.cs
View file @ 18ac5b63
......@@ -70,6 +70,6 @@ namespace Edu.Model.Entity.Course
/// <summary>
/// 所属科目
/// </summary>
public CourseSubjectEnum CourseSubject { get; set; }
public int CourseSubject { get; set; }
}
}
\ No newline at end of file
Edu.Model/ViewModel/Course/CourseCategoryTree_ViewModel.cs
View file @ 18ac5b63
......@@ -28,7 +28,7 @@ namespace Edu.Model.ViewModel.Course
/// <summary>
/// 所属科目
/// </summary>
public CourseSubjectEnum CourseSubject { get; set; }
public int CourseSubject { get; set; }
/// <summary>
/// 分类下级列表
......
Edu.Model/ViewModel/Course/RB_Course_Category_ViewModel.cs
View file @ 18ac5b63
......@@ -52,6 +52,6 @@ namespace Edu.Model.ViewModel.Course
/// <summary>
/// 所属科目名称
/// </summary>
public string CourseSubjectName { get { return this.CourseSubject.ToName(); } }
public string CourseSubjectName { get; set; }
}
}
\ No newline at end of file
Edu.Model/ViewModel/Course/RB_Course_ViewModel.cs
View file @ 18ac5b63
......@@ -168,7 +168,7 @@ namespace Edu.Model.ViewModel.Course
/// <summary>
/// 所属科目名称
/// </summary>
public string CourseSubjectName { get { return this.CourseSubject.ToName(); } }
public string CourseSubjectName { get; set; }
}
}
\ No newline at end of file
Edu.Model/ViewModel/Grade/RB_Class_ViewModel.cs
View file @ 18ac5b63
......@@ -253,12 +253,12 @@ namespace Edu.Model.ViewModel.Grade
/// <summary>
/// 所属科目
/// </summary>
public CourseSubjectEnum CourseSubject { get; set; }
public int CourseSubject { get; set; }
/// <summary>
/// 科目名称
/// </summary>
public string CourseSubjectName { get { return this.CourseSubject.ToName(); } }
public string CourseSubjectName { get; set; }
}
/// <summary>
......
Edu.Model/ViewModel/Sell/RB_Order_ViewModel.cs
View file @ 18ac5b63
......@@ -248,11 +248,11 @@ namespace Edu.Model.ViewModel.Sell
/// <summary>
/// 所属科目
/// </summary>
public CourseSubjectEnum CourseSubject { get; set; }
public int CourseSubject { get; set; }
/// <summary>
/// 科目名称
/// </summary>
public string CourseSubjectName { get { return this.CourseSubject.ToName(); } }
public string CourseSubjectName { get; set; }
}
}
\ No newline at end of file
Edu.Repository/Course/RB_CourseRepository.cs
View file @ 18ac5b63
......@@ -80,7 +80,7 @@ WHERE 1=1
//所属科目
if (query.CourseSubject > 0)
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Course_ViewModel.CourseSubject), (int)query.CourseSubject);
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Course_ViewModel.CourseSubject),query.CourseSubject);
}
}
return Get<RB_Course_ViewModel>(builder.ToString(), parameters).ToList();
......@@ -99,8 +99,9 @@ WHERE 1=1
var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,IFNULL(B.CateName,'') AS CateName
SELECT A.*,IFNULL(B.CateName,'') AS CateName,IFNULL(C.SubjectName,'') AS CourseSubjectName
FROM RB_Course AS A LEFT JOIN rb_course_category AS B ON A.CateId=B.CateId
LEFT JOIN rb_course_subject AS C ON A.CourseSubject=C.Id
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_ViewModel.Group_Id), query.Group_Id);
......
Edu.Repository/Course/RB_Course_CategoryRepository.cs
View file @ 18ac5b63
......@@ -68,9 +68,10 @@ WHERE 1=1
StringBuilder builder = new StringBuilder();
var parameters = new DynamicParameters();
builder.AppendFormat(@"
SELECT A.*,IFNULL(B.CourseCount,0) AS CourseCount
SELECT A.*,IFNULL(B.CourseCount,0) AS CourseCount,IFNULL(C.SubjectName,'') AS CourseSubjectName
FROM RB_Course_Category AS A
LEFT JOIN (SELECT COUNT(1) AS CourseCount,CateId FROM rb_course WHERE `Status`=0 GROUP BY CateId) AS B ON A.CateId=B.CateId
LEFT JOIN rb_course_subject AS C ON A.CourseSubject=C.Id
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Course_Category_ViewModel.Status), (int)DateStateEnum.Normal);
......
Edu.Repository/Grade/RB_ClassRepository.cs
View file @ 18ac5b63
......@@ -214,7 +214,7 @@ WHERE 1=1
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,B.CourseName,C.AssistName,IFNULL(C.AssistIcon,'') AS AssistIcon,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead
,E.SName AS SchoolName,IFNULL(F.RoomName,'') AS RoomName,plan.TotalPlanNum,ySplan.UsePlanNum,B.CourseSubject
,E.SName AS SchoolName,IFNULL(F.RoomName,'') AS RoomName,plan.TotalPlanNum,ySplan.UsePlanNum,B.CourseSubject,IFNULL(csubject.SubjectName,'') AS CourseSubjectName
FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
LEFT JOIN rb_assist AS C ON A.Assist_Id=C.AId
LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId
......@@ -222,6 +222,7 @@ FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
LEFT JOIN rb_class_room AS F ON A.ClassRoomId=F.RoomId
LEFT JOIN ((SELECT ClassId,COUNT(*) AS TotalPlanNum FROM rb_class_plan where `Status`=0 GROUP BY ClassId)) as plan on plan.ClassId=a.ClassId
LEFT JOIN ((SELECT ClassId,COUNT(*) AS UsePlanNum FROM rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%Y-%m-%d') <=DATE_FORMAT(NOW(),'%Y-%m-%d') GROUP BY ClassId)) as ySplan on ySplan.ClassId=a.ClassId
LEFT JOIN rb_course_subject AS csubject ON B.CourseSubject=csubject.Id
WHERE 1=1
");
if (query != null)
......@@ -293,7 +294,7 @@ WHERE 1=1
}
if (query.CourseSubject > 0)
{
builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_Class_ViewModel.CourseSubject), (int)query.CourseSubject);
builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_Class_ViewModel.CourseSubject), query.CourseSubject);
}
}
return GetPage<RB_Class_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
......@@ -335,12 +336,13 @@ WHERE A.ClassId={0}
builder.AppendFormat(@"
SELECT A.*,B.CourseName,B.CourseFeature,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead,E.SName AS SchoolName,R.RoomName
,IFNULL(t.GuestNum,0) AS OrderStudentCount,IFNULL(B.SellPrice,0) AS CourseSellPrice,IFNULL(B.OriginalPrice,0) AS CourseOriginalPrice
,B.CourseSubject
,B.CourseSubject,IFNULL(csubject.SubjectName,'') AS CourseSubjectName
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
LEFT JOIN rb_class_room AS R ON A.ClassRoomId=R.RoomId
LEFT JOIN rb_school AS E ON A.School_Id=E.SId
LEFT JOIN (SELECT ClassId,SUM(GuestNum) AS GuestNum FROM rb_order WHERE OrderState IN (1,2) GROUP BY ClassId)t on A.ClassId = t.ClassId
LEFT JOIN rb_course_subject AS csubject ON B.CourseSubject=csubject.Id
WHERE 1=1
");
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Status), 0);
......
Edu.Repository/Sell/RB_OrderRepository.cs
View file @ 18ac5b63
......@@ -254,7 +254,7 @@ ORDER BY {orderBy}
}
if (demodel.CourseSubject > 0)
{
where += $@" and course.{nameof(RB_Order_ViewModel.CourseSubject)} = {(int)demodel.CourseSubject}";
where += $@" and course.{nameof(RB_Order_ViewModel.CourseSubject)} = {demodel.CourseSubject}";
}
string orderBy = " o.OrderId asc";
if (demodel.Q_OrderBy == 1)
......@@ -267,13 +267,14 @@ ORDER BY {orderBy}
}
string sql = $@"
select o.*,c.ClassName,c.ClassNo,c.School_Id as ClassSchoolId,t.TeacherName,t.TeacherIcon,IFNULL(course.CourseName,'') AS CourseName
,C.OpenTime,course.CourseSubject
from RB_Order o
left join rb_class c on o.ClassId = c.ClassId
left join rb_teacher t on c.Teacher_Id = t.TId
LEFT JOIN rb_course AS course ON (o.CourseId=course.CourseId AND o.CourseId>0 AND o.OrderType=1)
where {where} order by {orderBy}
SELECT o.*,c.ClassName,c.ClassNo,c.School_Id as ClassSchoolId,t.TeacherName,t.TeacherIcon,IFNULL(course.CourseName,'') AS CourseName
,C.OpenTime,course.CourseSubject,IFNULL(csubject.SubjectName,'') AS CourseSubjectName
FROM RB_Order o
LEFT JOIN rb_class c on o.ClassId = c.ClassId
LEFT JOIN rb_teacher t on c.Teacher_Id = t.TId
LEFT JOIN rb_course AS course ON (o.CourseId=course.CourseId AND o.CourseId>0 AND o.OrderType=1)
LEFT JOIN rb_course_subject AS csubject ON course.CourseSubject=csubject.Id
WHERE {where} ORDER BY {orderBy}
";
return GetPage<RB_Order_ViewModel>(pageIndex, pageSize, out rowsCount, sql).ToList();
}
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 18ac5b63
......@@ -55,7 +55,7 @@ namespace Edu.WebApi.Controllers.Course
TeacherName = base.ParmJObj.GetStringValue("TeacherName"),
CourseName = base.ParmJObj.GetStringValue("CourseName"),
ClassNo = base.ParmJObj.GetStringValue("ClassNo"),
CourseSubject=(CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
CourseSubject=base.ParmJObj.GetInt("CourseSubject"),
};
query.Group_Id = base.UserInfo.Group_Id;
List<object> result = new List<object>();
......
Edu.WebApi/Controllers/Course/CourseController.cs
View file @ 18ac5b63
......@@ -143,7 +143,7 @@ namespace Edu.WebApi.Controllers.Course
var query = new RB_Course_Category_ViewModel()
{
CateName = base.ParmJObj.GetStringValue("CateName"),
CourseSubject = (CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
CourseSubject = base.ParmJObj.GetInt("CourseSubject"),
};
query.Group_Id = base.UserInfo.Group_Id;
query.School_Id = base.UserInfo.School_Id;
......@@ -221,7 +221,7 @@ namespace Edu.WebApi.Controllers.Course
ParentId = base.ParmJObj.GetInt("ParentId"),
SortNum = base.ParmJObj.GetInt("SortNum"),
Status = (DateStateEnum)base.ParmJObj.GetInt("Status"),
CourseSubject=(CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
CourseSubject=base.ParmJObj.GetInt("CourseSubject"),
};
extModel.CreateTime = DateTime.Now;
extModel.CreateBy = UserInfo.Id;
......@@ -291,7 +291,7 @@ namespace Edu.WebApi.Controllers.Course
IsQPrice = base.ParmJObj.GetInt("IsQPrice"),
IsQTeacher = base.ParmJObj.GetInt("IsQTeacher"),
Saleplat = base.ParmJObj.GetStringValue("Saleplat"),
CourseSubject=(CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
CourseSubject=base.ParmJObj.GetInt("CourseSubject"),
};
query.Group_Id = base.UserInfo.Group_Id;
var list = courseModule.GetCoursePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
......@@ -323,7 +323,7 @@ namespace Edu.WebApi.Controllers.Course
var query = new RB_Course_ViewModel()
{
IsQPrice = base.ParmJObj.GetInt("IsQPrice", 0),
CourseSubject=(CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
CourseSubject=base.ParmJObj.GetInt("CourseSubject"),
};
query.Group_Id = base.UserInfo.Group_Id;
query.School_Id = base.UserInfo.School_Id;
......@@ -384,7 +384,7 @@ namespace Edu.WebApi.Controllers.Course
IsKCourse = base.ParmJObj.GetInt("IsKCourse"),
ClassHours = base.ParmJObj.GetDecimal("ClassHours"),
CourseRate = (CourseRateEnum)base.ParmJObj.GetInt("CourseRate"),
CourseSubject = (CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
CourseSubject = base.ParmJObj.GetInt("CourseSubject"),
};
try
{
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ 18ac5b63
......@@ -52,7 +52,7 @@ namespace Edu.WebApi.Controllers.Course
Q_CanApply = base.ParmJObj.GetInt("Q_CanApply"),
JoinStartTime = base.ParmJObj.GetStringValue("JoinStartTime"),
JoinEndTime = base.ParmJObj.GetStringValue("JoinEndTime"),
CourseSubject=(CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
CourseSubject=base.ParmJObj.GetInt("CourseSubject"),
};
dmodel.School_Id = -1;
var schoolId = base.ParmJObj.GetStringValue("School_Id");
......@@ -1240,7 +1240,7 @@ namespace Edu.WebApi.Controllers.Course
Q_OrderState = base.ParmJObj.GetInt("Q_OrderState"),
Q_OrderBy = base.ParmJObj.GetInt("Q_OrderBy"),
PlatformTax = base.ParmJObj.GetDecimal("PlatformTax"),
CourseSubject=(CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
CourseSubject=base.ParmJObj.GetInt("CourseSubject"),
};
demodel.Group_Id = userInfo.Group_Id;
demodel.EnterID = userInfo.Id;
......@@ -1425,7 +1425,7 @@ namespace Edu.WebApi.Controllers.Course
EnterID = base.ParmJObj.GetInt("EnterID"),
HelpEnterId = base.ParmJObj.GetInt("HelpEnterId", 0),
ClassNo = base.ParmJObj.GetStringValue("ClassNo"),
CourseSubject=(CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
CourseSubject=base.ParmJObj.GetInt("CourseSubject"),
};
demodel.Group_Id = userInfo.Group_Id;
......
Edu.WebApi/Controllers/Course/TeacherClassController.cs
View file @ 18ac5b63
......@@ -53,7 +53,7 @@ namespace Edu.WebApi.Controllers.Course
School_Id = base.ParmJObj.GetInt("School_Id"),
TeacherName = base.ParmJObj.GetStringValue("TeacherName"),
CourseName = base.ParmJObj.GetStringValue("CourseName"),
CourseSubject = (CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
CourseSubject = base.ParmJObj.GetInt("CourseSubject"),
};
query.Group_Id = base.UserInfo.Group_Id;
List<object> result = new List<object>();
......
Edu.WebApi/Controllers/LearningGarden/SchoolGardenController.cs
View file @ 18ac5b63
......@@ -253,7 +253,7 @@ namespace Edu.WebApi.Controllers.LearningGarden
DateTime dt = new DateTime(time_tricks);//转化为DateTime
return dt.ToString("yyyy-MM-dd HH:mm:ss");
}
catch (Exception ex)
catch
{
return "";
}
......
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