Commit a96fb421 authored by 黄奎's avatar 黄奎

接口修改

parent dbe9ec3a
...@@ -26,5 +26,12 @@ namespace EduSpider.IRepository ...@@ -26,5 +26,12 @@ namespace EduSpider.IRepository
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public List<ExamWorkResult> GetStuHomeWorkListRepository(CourseQuery query); public List<ExamWorkResult> GetStuHomeWorkListRepository(CourseQuery query);
/// <summary>
/// 获取家庭作业列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Stu_HomeWork_Extend> GetStuHomeWorkDetailsListRepository(CourseQuery query);
} }
} }
...@@ -43,5 +43,12 @@ namespace EduSpider.IServices ...@@ -43,5 +43,12 @@ namespace EduSpider.IServices
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<object> GetCourseHomeWork(CourseQuery query); public List<object> GetCourseHomeWork(CourseQuery query);
/// <summary>
/// 获取作业详情
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<object> GetHomeWorkDetails(CourseQuery query);
} }
} }
...@@ -40,5 +40,9 @@ ...@@ -40,5 +40,9 @@
/// </summary> /// </summary>
public string KeyWords { get; set;} public string KeyWords { get; set;}
/// <summary>
/// 作业编号
/// </summary>
public int HomeWorkId { get; set; }
} }
} }
...@@ -32,12 +32,12 @@ namespace EduSpider.Repository ...@@ -32,12 +32,12 @@ namespace EduSpider.Repository
} }
/// <summary> /// <summary>
/// 获取学生作业列表 /// 获取家庭作业列表
/// </summary> /// </summary>
/// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<ExamWorkResult> GetStuHomeWorkListRepository(CourseQuery query) public List<RB_Stu_HomeWork_Extend> GetStuHomeWorkDetailsListRepository(CourseQuery query)
{ {
List<ExamWorkResult> list = new();
StringBuilder builder = new(); StringBuilder builder = new();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.*,B.homework_title,B.score_value,C.courseName SELECT A.*,B.homework_title,B.score_value,C.courseName
...@@ -59,8 +59,23 @@ WHERE 1=1 ...@@ -59,8 +59,23 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Stu_HomeWork_Extend.student_uid), query.StuIds); builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Stu_HomeWork_Extend.student_uid), query.StuIds);
} }
if (query.HomeWorkId > 0)
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Stu_HomeWork_Extend.homework_id), query.HomeWorkId);
}
} }
var dataList = Get<RB_Stu_HomeWork_Extend>(builder.ToString()).ToList(); var dataList = Get<RB_Stu_HomeWork_Extend>(builder.ToString()).ToList();
return dataList;
}
/// <summary>
/// 获取学生作业列表
/// </summary>
/// <returns></returns>
public List<ExamWorkResult> GetStuHomeWorkListRepository(CourseQuery query)
{
List<ExamWorkResult> list = new();
var dataList = GetStuHomeWorkDetailsListRepository(query);
List<ExamWorkResult> homeWorkList = new(); List<ExamWorkResult> homeWorkList = new();
if (dataList != null && dataList.Count > 0) if (dataList != null && dataList.Count > 0)
{ {
...@@ -69,7 +84,7 @@ WHERE 1=1 ...@@ -69,7 +84,7 @@ WHERE 1=1
{ {
homeWorkList.Add(new ExamWorkResult() homeWorkList.Add(new ExamWorkResult()
{ {
RowNum= RowNum, RowNum = RowNum,
CreateTime = item.add_time, CreateTime = item.add_time,
ResultType = 1, ResultType = 1,
Title = item.Homework_title, Title = item.Homework_title,
...@@ -78,7 +93,7 @@ WHERE 1=1 ...@@ -78,7 +93,7 @@ WHERE 1=1
ScoreType = item.score_type, ScoreType = item.score_type,
Score_Value = item.Score_value, Score_Value = item.Score_value,
HomeWorkStatus = item.status, HomeWorkStatus = item.status,
ThName=item.th_name, ThName = item.th_name,
}); });
RowNum++; RowNum++;
...@@ -99,7 +114,7 @@ WHERE 1=1 ...@@ -99,7 +114,7 @@ WHERE 1=1
{ {
CreateTime = firstList.LastOrDefault().CreateTime.AddMinutes(1), CreateTime = firstList.LastOrDefault().CreateTime.AddMinutes(1),
ResultType = 3, ResultType = 3,
Title = firstList.LastOrDefault().ThName+ "老师的评语", Title = firstList.LastOrDefault().ThName + "老师的评语",
Comment = commentModel?.Info Comment = commentModel?.Info
}; };
......
...@@ -55,6 +55,7 @@ namespace EduSpider.Services ...@@ -55,6 +55,7 @@ namespace EduSpider.Services
[Autowired] [Autowired]
public IExam_ScoreRepository Exam_ScoreRepository { get; set; } public IExam_ScoreRepository Exam_ScoreRepository { get; set; }
/// <summary> /// <summary>
/// 获取学员课程列表 /// 获取学员课程列表
...@@ -221,5 +222,44 @@ namespace EduSpider.Services ...@@ -221,5 +222,44 @@ namespace EduSpider.Services
} }
return result; return result;
} }
/// <summary>
/// 获取作业详情
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<object> GetHomeWorkDetails(CourseQuery query)
{
List<object> result = new();
var list = StuHomeWorkRepository.GetStuHomeWorkDetailsListRepository(query);
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
string str = "";
if (item.status == 0)
{
str = "未提交";
}
else if (item.status == 1)
{
str = "已提交";
}
else if (item.status == 2)
{
str = "已批阅";
}
result.Add(new
{
HomeWorkId = item.homework_id,
HomeWorkTitle = item.Homework_title,
Status= item.status,
StatusStr = str,
});
}
}
return result;
}
} }
} }
...@@ -74,7 +74,6 @@ namespace EduSpider.WebApi.Controllers ...@@ -74,7 +74,6 @@ namespace EduSpider.WebApi.Controllers
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[HttpGet] [HttpGet]
public ApiResult GetCourseStu() public ApiResult GetCourseStu()
{ {
var query = new Model.Query.CourseQuery() var query = new Model.Query.CourseQuery()
...@@ -104,7 +103,6 @@ namespace EduSpider.WebApi.Controllers ...@@ -104,7 +103,6 @@ namespace EduSpider.WebApi.Controllers
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[HttpGet] [HttpGet]
public ApiResult GetCourseHomeWork() public ApiResult GetCourseHomeWork()
{ {
var query = new Model.Query.CourseQuery() var query = new Model.Query.CourseQuery()
...@@ -114,5 +112,21 @@ namespace EduSpider.WebApi.Controllers ...@@ -114,5 +112,21 @@ namespace EduSpider.WebApi.Controllers
var list = CourseService.GetCourseHomeWork(query); var list = CourseService.GetCourseHomeWork(query);
return ApiResult.Success(data: list); return ApiResult.Success(data: list);
} }
/// <summary>
/// 获取课程家庭作业详情
/// </summary>
/// <returns></returns>
[HttpPost]
[HttpGet]
public ApiResult GetHomeWorkDetails()
{
var query = new Model.Query.CourseQuery()
{
HomeWorkId = base.ReqParameters.GetInt("HomeWorkId")
};
var list = CourseService.GetHomeWorkDetails(query);
return ApiResult.Success(data: 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