Skip to content

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

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

parents cc63eca2 5661bfca
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 38 deletions
EduSpider.Model/Query/CourseQuery.cs
View file @ 4b7cf449
...@@ -71,5 +71,10 @@ namespace EduSpider.Model.Query ...@@ -71,5 +71,10 @@ namespace EduSpider.Model.Query
/// 默认评价编号 /// 默认评价编号
/// </summary> /// </summary>
public int DefaultCommentId { get; set; } public int DefaultCommentId { get; set; }
/// <summary>
/// 学员作业编号
/// </summary>
public long Stu_HomeWork_Id { get; set; }
} }
} }
EduSpider.Repository/StuCommentDetailsRepository.cs
View file @ 4b7cf449
...@@ -32,6 +32,7 @@ namespace EduSpider.Repository ...@@ -32,6 +32,7 @@ namespace EduSpider.Repository
StuUid = item.StuUid, StuUid = item.StuUid,
HomeWorkId = item.HomeWorkId, HomeWorkId = item.HomeWorkId,
}).FirstOrDefault(); }).FirstOrDefault();
string createTimeStr = ""; string createTimeStr = "";
if (defaultModel != null) if (defaultModel != null)
{ {
...@@ -42,7 +43,7 @@ namespace EduSpider.Repository ...@@ -42,7 +43,7 @@ namespace EduSpider.Repository
var homeWorkModel = new StuHomeWorkRepository().GetStuHomeWorkDetailsListRepository(new CourseQuery() var homeWorkModel = new StuHomeWorkRepository().GetStuHomeWorkDetailsListRepository(new CourseQuery()
{ {
CourseId = item.CourseId, CourseId = item.CourseId,
HomeWorkId = item.HomeWorkId, Stu_HomeWork_Id = item.HomeWorkId,
StuIds = item.StuUid.ToString() StuIds = item.StuUid.ToString()
}).FirstOrDefault(); }).FirstOrDefault();
if (homeWorkModel != null) if (homeWorkModel != null)
...@@ -58,7 +59,6 @@ namespace EduSpider.Repository ...@@ -58,7 +59,6 @@ namespace EduSpider.Repository
{ {
item.CreateTime = DateTime.Now; item.CreateTime = DateTime.Now;
} }
// flag = base.Insert(item) > 0;
} }
bool flag = BatchInsert(list); bool flag = BatchInsert(list);
return flag; return flag;
......
EduSpider.Repository/StuHomeWorkRepository.cs
View file @ 4b7cf449
...@@ -61,6 +61,10 @@ WHERE 1=1 ...@@ -61,6 +61,10 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Stu_HomeWork_Extend.homework_id), query.HomeWorkId); builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Stu_HomeWork_Extend.homework_id), query.HomeWorkId);
} }
if (query.Stu_HomeWork_Id > 0)
{
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Stu_HomeWork_Extend.stu_homework_id), query.Stu_HomeWork_Id);
}
if (!string.IsNullOrEmpty(query.QHomeWorkIds)) if (!string.IsNullOrEmpty(query.QHomeWorkIds))
{ {
builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Stu_HomeWork_Extend.homework_id), query.QHomeWorkIds); builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Stu_HomeWork_Extend.homework_id), query.QHomeWorkIds);
...@@ -139,17 +143,7 @@ WHERE 1=1 ...@@ -139,17 +143,7 @@ WHERE 1=1
var First_Stu_HomeWork_Id = firstList.LastOrDefault().Stu_HomeWork_Id; var First_Stu_HomeWork_Id = firstList.LastOrDefault().Stu_HomeWork_Id;
var tempModel = GetSystemCreateComment(commentList, cItem.course_id, First_Stu_HomeWork_Id); var tempModel = GetSystemCreateComment(commentList, cItem.course_id, First_Stu_HomeWork_Id);
var firstNum = CreateRandomNum(); var firstNum = CreateRandomNum();
var firstStartTime = firstList.LastOrDefault().CreateTime; var firstStartTime = firstList.LastOrDefault().CreateTime.AddSeconds(1);
var secondModel = homeWorkList.Where(qitem => qitem.RowNum == 6).FirstOrDefault();
if (secondModel != null)
{
var newSeconds = CreateRandomSecondNum(firstStartTime, secondModel.CreateTime);
firstStartTime = firstStartTime.AddSeconds(newSeconds);
}
else
{
firstStartTime = firstStartTime.AddMinutes(firstNum);
}
if (tempModel == null || (tempModel != null && tempModel.Id <= 0)) if (tempModel == null || (tempModel != null && tempModel.Id <= 0))
{ {
var f_model = new RB_Stu_Comment_Extend() var f_model = new RB_Stu_Comment_Extend()
...@@ -199,18 +193,8 @@ WHERE 1=1 ...@@ -199,18 +193,8 @@ WHERE 1=1
var Second_Stu_HomeWork_Id = secondList.LastOrDefault().Stu_HomeWork_Id; var Second_Stu_HomeWork_Id = secondList.LastOrDefault().Stu_HomeWork_Id;
var secondModel = GetSystemCreateComment(commentList, cItem.course_id, Second_Stu_HomeWork_Id); var secondModel = GetSystemCreateComment(commentList, cItem.course_id, Second_Stu_HomeWork_Id);
var secondNum = CreateRandomNum(); var secondNum = CreateRandomNum();
var secondTime = secondList.LastOrDefault().CreateTime; var secondTime = secondList.LastOrDefault().CreateTime.AddSeconds(1);
var thirdModel = homeWorkList.Where(qitem => qitem.RowNum == 10).FirstOrDefault();
if (thirdModel != null)
{
var newSeconds = CreateRandomSecondNum(secondTime, thirdModel.CreateTime);
secondTime = secondTime.AddSeconds(newSeconds);
}
else
{
secondTime = secondTime.AddMinutes(secondNum);
}
if (secondModel == null || (secondModel != null && secondModel.Id <= 0)) if (secondModel == null || (secondModel != null && secondModel.Id <= 0))
{ {
var s_model = new RB_Stu_Comment_Extend() var s_model = new RB_Stu_Comment_Extend()
...@@ -259,17 +243,8 @@ WHERE 1=1 ...@@ -259,17 +243,8 @@ WHERE 1=1
var Third_Stu_HomeWork_Id = thirdList.LastOrDefault().Stu_HomeWork_Id; var Third_Stu_HomeWork_Id = thirdList.LastOrDefault().Stu_HomeWork_Id;
var thirdModel = GetSystemCreateComment(commentList, cItem.course_id, Third_Stu_HomeWork_Id); var thirdModel = GetSystemCreateComment(commentList, cItem.course_id, Third_Stu_HomeWork_Id);
var thirdNum = CreateRandomNum(); var thirdNum = CreateRandomNum();
var thirdTime = thirdList.LastOrDefault().CreateTime; var thirdTime = thirdList.LastOrDefault().CreateTime.AddSeconds(1);
var fourthModel = homeWorkList.Where(qitem => qitem.RowNum == 14).FirstOrDefault();
if (fourthModel != null)
{
var newSeconds = CreateRandomSecondNum(thirdTime, fourthModel.CreateTime);
thirdTime = thirdTime.AddSeconds(newSeconds);
}
else
{
thirdTime = thirdTime.AddMinutes(thirdNum);
}
if (thirdModel == null || (thirdModel != null && thirdModel.Id <= 0)) if (thirdModel == null || (thirdModel != null && thirdModel.Id <= 0))
{ {
var t_model = new RB_Stu_Comment_Extend() var t_model = new RB_Stu_Comment_Extend()
...@@ -279,7 +254,7 @@ WHERE 1=1 ...@@ -279,7 +254,7 @@ WHERE 1=1
CourseId = cItem.course_id, CourseId = cItem.course_id,
CreateType = 1, CreateType = 1,
CreateByName = thirdList.LastOrDefault().ThName, CreateByName = thirdList.LastOrDefault().ThName,
CreateTime = thirdList.LastOrDefault().CreateTime.AddMinutes(thirdNum), CreateTime = thirdTime,
ShowType = 3, ShowType = 3,
Details = new List<RB_Stu_CommentDetails>() Details = new List<RB_Stu_CommentDetails>()
}; };
...@@ -295,7 +270,7 @@ WHERE 1=1 ...@@ -295,7 +270,7 @@ WHERE 1=1
Info = info, Info = info,
CreateType = 1, CreateType = 1,
CreateByName = thirdList.LastOrDefault().ThName, CreateByName = thirdList.LastOrDefault().ThName,
CreateTime = thirdList.LastOrDefault().CreateTime.AddMinutes(thirdNum), CreateTime = thirdTime,
ShowType = 3, ShowType = 3,
}); });
new StuCommentRepository().SetStuCommentRepository(t_model); new StuCommentRepository().SetStuCommentRepository(t_model);
......
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