Skip to content

E
EduSpider
Commit d4d6c3bf authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/eduspider

parents d0046d1f 14ded93f
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 11 deletions
EduSpider.IRepository/IStuCommentRepository.cs
View file @ d4d6c3bf
...@@ -24,5 +24,20 @@ namespace EduSpider.IRepository ...@@ -24,5 +24,20 @@ namespace EduSpider.IRepository
/// <param name="query"></param> /// <param name="query"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Stu_Comment> GetStuCommentListRepository(CourseQuery query); public List<RB_Stu_Comment> GetStuCommentListRepository(CourseQuery query);
/// <summary>
/// 修改学员评论状态
/// </summary>
/// <param name="ShowType"></param>
/// <param name="Ids"></param>
/// <returns></returns>
public bool SetStuCommentShowTypeRepository(int ShowType, string Ids);
/// <summary>
/// 根据编号删除学员评论
/// </summary>
/// <param name="Ids"></param>
/// <returns></returns>
public bool DeleteStuCommentRepository(string Ids)
} }
} }
EduSpider.IServices/ICourseService.cs
View file @ d4d6c3bf
...@@ -86,5 +86,27 @@ namespace EduSpider.IServices ...@@ -86,5 +86,27 @@ namespace EduSpider.IServices
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
public bool SetStuComment(RB_Stu_Comment model); public bool SetStuComment(RB_Stu_Comment model);
/// <summary>
/// 获取学员评价列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Stu_Comment> GetStuCommentList(CourseQuery query);
/// <summary>
/// 修改学员评论状态
/// </summary>
/// <param name="ShowType"></param>
/// <param name="Ids"></param>
/// <returns></returns>
public bool SetStuCommentShowType(int ShowType, string Ids);
/// <summary>
/// 根据编号删除学员评论
/// </summary>
/// <param name="Ids"></param>
/// <returns></returns>
public bool RemoveStuComment(string Ids);
} }
} }
EduSpider.Model/Entity/RB_Stu_Comment.cs
View file @ d4d6c3bf
...@@ -60,5 +60,14 @@ namespace EduSpider.Model.Entity ...@@ -60,5 +60,14 @@ namespace EduSpider.Model.Entity
/// </summary> /// </summary>
public string CreateByName { get; set; } public string CreateByName { get; set; }
/// <summary>
/// 显示类型(1-全部可见，2-部分可见，3-不可见)
/// </summary>
public int ShowType { get; set; }
/// <summary>
/// 删除状态(0-正常，1-删除)
/// </summary>
public int Status { get; set; }
} }
} }
EduSpider.Repository/StuCommentRepository.cs
View file @ d4d6c3bf
...@@ -29,6 +29,7 @@ SELECT A.* ...@@ -29,6 +29,7 @@ SELECT A.*
FROM RB_Stu_Comment AS A FROM RB_Stu_Comment AS A
WHERE 1=1 WHERE 1=1
"); ");
builder.AppendFormat(" AND A.{0}=0 ", nameof(RB_Stu_Comment.Status));
if (query != null) if (query != null)
{ {
if (query.CourseId > 0) if (query.CourseId > 0)
...@@ -71,5 +72,28 @@ WHERE 1=1 ...@@ -71,5 +72,28 @@ WHERE 1=1
} }
return flag; return flag;
} }
/// <summary>
/// 修改学员评论状态
/// </summary>
/// <param name="ShowType"></param>
/// <param name="Ids"></param>
/// <returns></returns>
public bool SetStuCommentShowTypeRepository(int ShowType, string Ids)
{
string sql = string.Format("UPDATE RB_Stu_Comment SET ShowType={0} WHERE Id IN({1}) ", ShowType, Ids);
return base.Execute(sql) > 0;
}
/// <summary>
/// 根据编号删除学员评论
/// </summary>
/// <param name="Ids"></param>
/// <returns></returns>
public bool DeleteStuCommentRepository(string Ids)
{
string sql = string.Format("UPDATE RB_Stu_Comment SET Status=1 WHERE Id IN({0}) ", Ids);
return base.Execute(sql) > 0;
}
} }
} }
EduSpider.Services/CourseService.cs
View file @ d4d6c3bf
...@@ -277,7 +277,7 @@ namespace EduSpider.Services ...@@ -277,7 +277,7 @@ namespace EduSpider.Services
item.student_name, item.student_name,
item.student_uid, item.student_uid,
item.score, item.score,
item.score_p, score_p=item.score_p*100,
add_time = VTX.FW.Helper.ConvertHelper.FormatDate(item.add_time) add_time = VTX.FW.Helper.ConvertHelper.FormatDate(item.add_time)
}); });
} }
...@@ -345,5 +345,38 @@ namespace EduSpider.Services ...@@ -345,5 +345,38 @@ namespace EduSpider.Services
{ {
return StuCommentRepository.SetStuCommentRepository(model); return StuCommentRepository.SetStuCommentRepository(model);
} }
/// <summary>
/// 获取学员评价列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Stu_Comment> GetStuCommentList(CourseQuery query)
{
var list = StuCommentRepository.GetStuCommentListRepository(query);
return list;
}
/// <summary>
/// 修改学员评论状态
/// </summary>
/// <param name="ShowType"></param>
/// <param name="Ids"></param>
/// <returns></returns>
public bool SetStuCommentShowType(int ShowType, string Ids)
{
return StuCommentRepository.SetStuCommentShowTypeRepository(ShowType, Ids);
}
/// <summary>
/// 根据编号删除学员评论
/// </summary>
/// <param name="Ids"></param>
/// <returns></returns>
public bool RemoveStuComment(string Ids)
{
return StuCommentRepository.DeleteStuCommentRepository(Ids);
}
} }
} }
\ No newline at end of file
EduSpider.WebApi/Controllers/Student/TeacherController.cs
View file @ d4d6c3bf
...@@ -9,6 +9,7 @@ using VTX.FW.Api; ...@@ -9,6 +9,7 @@ using VTX.FW.Api;
using VTX.FW.Attr; using VTX.FW.Attr;
using VTX.FW.Helper; using VTX.FW.Helper;
using System.Linq; using System.Linq;
using EduSpider.Model.Query;
namespace EduSpider.WebApi.Controllers namespace EduSpider.WebApi.Controllers
{ {
...@@ -38,14 +39,14 @@ namespace EduSpider.WebApi.Controllers ...@@ -38,14 +39,14 @@ namespace EduSpider.WebApi.Controllers
TeacherIds = userInfo.AccountId.ToString(), TeacherIds = userInfo.AccountId.ToString(),
KeyWords = base.ReqParameters.GetString("KeyWords"), KeyWords = base.ReqParameters.GetString("KeyWords"),
}; };
//全部课程 //全部课程
List<object> AllCourseList = new(); List<object> AllCourseList = new();
//已结课 //已结课
List<object> FinishList = new(); List<object> FinishList = new();
//进行中 //进行中
List<object> NotFinishList = new(); List<object> NotFinishList = new();
var list = CourseService.GetTeacherCourseList(query).Where(qitem=>qitem.CourseStatus==1 || qitem.CompleteNum==qitem.TotalClassNum).ToList(); var list = CourseService.GetTeacherCourseList(query).Where(qitem => qitem.CourseStatus == 1 || qitem.CompleteNum == qitem.TotalClassNum).ToList();
if (list != null && list.Count > 0) if (list != null && list.Count > 0)
{ {
...@@ -61,7 +62,7 @@ namespace EduSpider.WebApi.Controllers ...@@ -61,7 +62,7 @@ namespace EduSpider.WebApi.Controllers
item.TeacherName, item.TeacherName,
}; };
AllCourseList.Add(obj); AllCourseList.Add(obj);
if (item.CompleteNum==item.TotalClassNum) if (item.CompleteNum == item.TotalClassNum)
{ {
FinishList.Add(obj); FinishList.Add(obj);
} }
...@@ -238,19 +239,71 @@ namespace EduSpider.WebApi.Controllers ...@@ -238,19 +239,71 @@ namespace EduSpider.WebApi.Controllers
{ {
var model = new RB_Stu_Comment() var model = new RB_Stu_Comment()
{ {
Id=base.ReqParameters.GetInt("Id"), Id = base.ReqParameters.GetInt("Id"),
HomeWorkId=base.ReqParameters.GetInt("HomeWorkId"), HomeWorkId = base.ReqParameters.GetInt("HomeWorkId"),
StuUid=base.ReqParameters.GetInt("StuUid"), StuUid = base.ReqParameters.GetInt("StuUid"),
CourseId=base.ReqParameters.GetInt("CourseId"), CourseId = base.ReqParameters.GetInt("CourseId"),
Times=base.ReqParameters.GetInt("Times"), Times = base.ReqParameters.GetInt("Times"),
Info=base.ReqParameters.GetString("Info"), Info = base.ReqParameters.GetString("Info"),
CreateType=base.ReqParameters.GetInt("CreateType"), CreateType = base.ReqParameters.GetInt("CreateType"),
}; };
model.ShowType = 3;
model.Status = 0;
model.CreateTime = System.DateTime.Now; model.CreateTime = System.DateTime.Now;
model.CreateBy = base.BaseUserId; model.CreateBy = base.BaseUserId;
model.CreateByName = base.UserInfo.AccountName; model.CreateByName = base.UserInfo.AccountName;
var flag = CourseService.SetStuComment(model); var flag = CourseService.SetStuComment(model);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
[HttpPost]
[HttpGet]
/// <summary>
/// 修改学员评论状态
/// </summary>
/// <returns></returns>
public ApiResult SetStuCommentShowType()
{
string Ids = base.ReqParameters.GetString("Ids");
int ShowType = base.ReqParameters.GetInt("ShowType");
var flag = CourseService.SetStuCommentShowType(ShowType, Ids);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
[HttpPost]
[HttpGet]
/// <summary>
/// 获取学员评论列表
/// </summary>
/// <returns></returns>
public ApiResult GetStuCommentList()
{
var query = new CourseQuery()
{
};
var list = CourseService.GetStuCommentList(query);
return ApiResult.Success(data: list);
}
[HttpPost]
[HttpGet]
/// <summary>
/// 删除学生评论
/// </summary>
/// <returns></returns>
public ApiResult RemoveStuComment()
{
string Ids = base.ReqParameters.GetString("Ids");
if (string.IsNullOrEmpty(Ids))
{
return ApiResult.ParamIsNull(message: "请选择要删除的评论!");
}
var list = CourseService.RemoveStuComment(Ids);
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