Commit c00b694e authored by 黄奎's avatar 黄奎

页面修改

parent ada84f88
...@@ -18,6 +18,13 @@ namespace EduSpider.Repository ...@@ -18,6 +18,13 @@ namespace EduSpider.Repository
/// <returns></returns> /// <returns></returns>
public bool BatchSetCourseRepository(List<RB_Course> courses); public bool BatchSetCourseRepository(List<RB_Course> courses);
/// <summary>
/// 批量新增修改课程指定字段
/// </summary>
/// <param name="courses"></param>
/// <returns></returns>
public bool BatchSetCourseOtherRepository(List<RB_Course> courses);
/// <summary> /// <summary>
/// 获取课程分页列表 /// 获取课程分页列表
/// </summary> /// </summary>
......
...@@ -72,9 +72,9 @@ namespace EduSpider.Model.Entity ...@@ -72,9 +72,9 @@ namespace EduSpider.Model.Entity
public int? teacherNum { get; set; } public int? teacherNum { get; set; }
/// <summary> /// <summary>
/// 课程状态(未结课,课程进度未完成,已结课) /// 课程状态(1-未结课,2-课程进度未完成,3-已结课)
/// </summary> /// </summary>
public CourseStatusEnum courseStatus { get; set; } public int courseStatus { get; set; }
/// <summary> /// <summary>
/// 回放地址 /// 回放地址
...@@ -109,7 +109,7 @@ namespace EduSpider.Model.Entity ...@@ -109,7 +109,7 @@ namespace EduSpider.Model.Entity
/// <summary> /// <summary>
/// 课程类型(1-标准课,公开课) /// 课程类型(1-标准课,公开课)
/// </summary> /// </summary>
public CourseTypeEnum courseType { get; set; } public int courseType { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
......
 namespace EduSpider.Model.Query
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace EduSpider.Model.Query
{ {
/// <summary> /// <summary>
/// 课程查询实体类 /// 课程查询实体类
...@@ -36,6 +29,11 @@ namespace EduSpider.Model.Query ...@@ -36,6 +29,11 @@ namespace EduSpider.Model.Query
/// 教师编号 /// 教师编号
/// </summary> /// </summary>
public string TeacherIds { get; set; } public string TeacherIds { get; set; }
/// <summary>
/// 课程状态(0-全部,1-进行中,2,-已完成)
/// </summary>
public int QCourseState { get; set; }
} }
} }
...@@ -25,6 +25,26 @@ namespace EduSpider.Repository ...@@ -25,6 +25,26 @@ namespace EduSpider.Repository
return flag; return flag;
} }
/// <summary>
/// 批量修改其他字段
/// </summary>
/// <param name="courses"></param>
/// <returns></returns>
public bool BatchSetCourseOtherRepository(List<RB_Course> courses)
{
var parameters = new DynamicParameters();
string sql = @"
UPDATE RB_Course
SET courseWare=@courseWare,coverImg=@coverImg,courseType=@courseType,addTime=@addTime
WHERE courseId=@courseId ";
parameters.Add("courseWare", courses[0].courseWare);
parameters.Add("coverImg", courses[0].coverImg);
parameters.Add("courseType", courses[0].courseType);
parameters.Add("addTime", courses[0].addTime);
parameters.Add("courseId", courses[0].courseId);
return Execute(sql, parameters) > 0;
}
/// <summary> /// <summary>
/// 获取课程列表 /// 获取课程列表
/// </summary> /// </summary>
......
...@@ -51,6 +51,19 @@ WHERE 1=1 ...@@ -51,6 +51,19 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Course_Student.uid), query.TeacherIds); builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Course_Student.uid), query.TeacherIds);
} }
if (query.QCourseState > 0)
{
//进行中
if (query.QCourseState == 1)
{
builder.AppendFormat(" AND B.{0} IN({1}) AND B.totalClassNum<>B.completeNum ", nameof(RB_Course.courseStatus), 1);
}
//已完成
if (query.QCourseState == 2)
{
builder.AppendFormat(" AND B.{0} IN({1}) ", nameof(RB_Course.courseStatus), 3);
}
}
} }
builder.AppendFormat(" ORDER BY A.courseId DESC "); builder.AppendFormat(" ORDER BY A.courseId DESC ");
return Get<RB_Course_Teacher_Extend>(builder.ToString(), parameters).ToList(); return Get<RB_Course_Teacher_Extend>(builder.ToString(), parameters).ToList();
......
...@@ -31,13 +31,19 @@ namespace EduSpider.WebApi.Controllers ...@@ -31,13 +31,19 @@ namespace EduSpider.WebApi.Controllers
{ {
TeacherIds = base.BaseUserId.ToString() TeacherIds = base.BaseUserId.ToString()
}; };
List<object> result = new List<object>(); //全部课程
List<object> AllCourseList = new List<object>();
//已结课
List<object> FinishList = new List<object>();
//进行中
List<object> NotFinishList = new List<object>();
var list = CourseService.GetTeacherCourseList(query); var list = CourseService.GetTeacherCourseList(query);
if (list != null && list.Count > 0) if (list != null && list.Count > 0)
{ {
foreach (var item in list) foreach (var item in list)
{ {
result.Add(new var obj = new
{ {
item.courseId, item.courseId,
item.courseName, item.courseName,
...@@ -45,9 +51,19 @@ namespace EduSpider.WebApi.Controllers ...@@ -45,9 +51,19 @@ namespace EduSpider.WebApi.Controllers
item.completeNum, item.completeNum,
item.totalClassNum, item.totalClassNum,
item.teacherName, item.teacherName,
}); };
AllCourseList.Add(obj);
if (item.courseStatus == 3)
{
FinishList.Add(obj);
}
if (item.courseStatus == 1 && item.completeNum != item.totalClassNum)
{
NotFinishList.Add(obj);
}
} }
} }
var result = new { AllCourseList, FinishList, NotFinishList };
return ApiResult.Success(data: result); return ApiResult.Success(data: result);
} }
......
...@@ -133,14 +133,14 @@ namespace EduSpider.Spiders.ClassInRule ...@@ -133,14 +133,14 @@ namespace EduSpider.Spiders.ClassInRule
studentNum = courseObj.GetInt("studentNum"), studentNum = courseObj.GetInt("studentNum"),
auditNum = courseObj.GetInt("auditNum"), auditNum = courseObj.GetInt("auditNum"),
teacherNum = courseObj.GetInt("teacherNum"), teacherNum = courseObj.GetInt("teacherNum"),
courseStatus = (CourseStatusEnum)courseObj.GetInt("courseStatus"), courseStatus = courseObj.GetInt("courseStatus"),
webCast = courseObj.GetString("webCast"), webCast = courseObj.GetString("webCast"),
teacherId = courseObj.GetInt("teacherId"), teacherId = courseObj.GetInt("teacherId"),
teacherAccount = courseObj.GetString("teacherAccount"), teacherAccount = courseObj.GetString("teacherAccount"),
teacherUid = courseObj.GetInt("teacherUid"), teacherUid = courseObj.GetInt("teacherUid"),
teacherName = courseObj.GetString("teacherName"), teacherName = courseObj.GetString("teacherName"),
teacherLogo = courseObj.GetString("teacherLogo"), teacherLogo = courseObj.GetString("teacherLogo"),
courseType = (CourseTypeEnum)courseObj.GetInt("courseType"), courseType = courseObj.GetInt("courseType"),
}); ; }); ;
} }
} }
...@@ -291,14 +291,14 @@ namespace EduSpider.Spiders.ClassInRule ...@@ -291,14 +291,14 @@ namespace EduSpider.Spiders.ClassInRule
studentNum = courseObj.GetInt("studentNum"), studentNum = courseObj.GetInt("studentNum"),
auditNum = courseObj.GetInt("auditNum"), auditNum = courseObj.GetInt("auditNum"),
teacherNum = courseObj.GetInt("teacherNum"), teacherNum = courseObj.GetInt("teacherNum"),
courseStatus = (CourseStatusEnum)courseObj.GetInt("courseStatus"), courseStatus = courseObj.GetInt("courseStatus"),
webCast = courseObj.GetString("webCast"), webCast = courseObj.GetString("webCast"),
teacherId = courseObj.GetInt("teacherId"), teacherId = courseObj.GetInt("teacherId"),
teacherAccount = courseObj.GetString("teacherAccount"), teacherAccount = courseObj.GetString("teacherAccount"),
teacherUid = courseObj.GetInt("teacherUid"), teacherUid = courseObj.GetInt("teacherUid"),
teacherName = courseObj.GetString("teacherName"), teacherName = courseObj.GetString("teacherName"),
teacherLogo = courseObj.GetString("teacherLogo"), teacherLogo = courseObj.GetString("teacherLogo"),
courseType = (CourseTypeEnum)courseObj.GetInt("courseType"), courseType = courseObj.GetInt("courseType"),
addTime = ConvertHelper.UnixToDateTime(courseObj.GetInt("addTime")), addTime = ConvertHelper.UnixToDateTime(courseObj.GetInt("addTime")),
courseWare = courseObj.GetString("courseWare"), courseWare = courseObj.GetString("courseWare"),
}; };
...@@ -314,7 +314,7 @@ namespace EduSpider.Spiders.ClassInRule ...@@ -314,7 +314,7 @@ namespace EduSpider.Spiders.ClassInRule
} }
if (list != null && list.Count > 0) if (list != null && list.Count > 0)
{ {
courseRepository.BatchSetCourseRepository(list); courseRepository.BatchSetCourseOtherRepository(list);
} }
} }
} }
......
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