Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/Entity/Exam/RB_StuWords_Prep.cs

+using Edu.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Exam
+{
+	/// <summary>
+	/// 学员单词预习实体类
+	/// </summary>
+	[Serializable]
+	[DB(ConnectionName = "DefaultConnection")]
+	public class RB_StuWords_Prep
+	{
+		/// <summary>
+		/// 预习主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 班级编号
+		/// </summary>
+		public int ClassId { get; set; }
+
+		/// <summary>
+		/// 课程编号
+		/// </summary>
+		public int CourseId { get; set; }
+
+		/// <summary>
+		/// Account表(Id字段)学员账号
+		/// </summary>
+		public int Stu_Account_Id { get; set; }
+
+		/// <summary>
+		/// 章节编号
+		/// </summary>
+		public int ChapterId { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
+
+		/// <summary>
+		/// 学校Id
+		/// </summary>
+		public int School_Id { get; set; }
+
+		/// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+		/// <summary>
+		/// 状态
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+
+		/// <summary>
+		/// 学习单词数量
+		/// </summary>
+		public int StudyNum { get; set; }
+
+		/// <summary>
+		/// 单词总数
+		/// </summary>
+		public int TotalNum { get; set; }
+
+		/// <summary>
+		/// 得分
+		/// </summary>
+		public decimal Score { get; set; }
+
+		/// <summary>
+		/// 开始时间
+		/// </summary>
+		public DateTime? StartTime { get; set; }
+
+		/// <summary>
+		/// 结束时间
+		/// </summary>
+		public DateTime? EndTime { get; set; }
+	}
+}

Edu.Model/Entity/Exam/RB_StuWords_Review.cs

+using Edu.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Exam
+{
+    /// <summary>
+    /// 学员单词复习实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_StuWords_Review
+    {
+		/// <summary>
+		/// 复习主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 班级编号
+		/// </summary>
+		public int ClassId { get; set; }
+
+		/// <summary>
+		/// 课程编号
+		/// </summary>
+		public int CourseId { get; set; }
+
+		/// <summary>
+		/// Account表(Id字段)学员账号
+		/// </summary>
+		public int Stu_Account_Id { get; set; }
+
+		/// <summary>
+		/// 章节编号
+		/// </summary>
+		public int ChapterId { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
+
+ 
+
+		/// <summary>
+		/// 学校Id
+		/// </summary>
+		public int School_Id { get; set; }
+
+		/// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+		/// <summary>
+		/// 状态
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+
+		/// <summary>
+		/// 复习单词数量
+		/// </summary>
+		public int ReviewNum { get; set; }
+
+		/// <summary>
+		/// 单词总数
+		/// </summary>
+		public int TotalNum { get; set; }
+
+		/// <summary>
+		/// 得分
+		/// </summary>
+		public decimal Score { get; set; }
+
+		/// <summary>
+		/// 开始时间
+		/// </summary>
+		public DateTime? StartTime { get; set; }
+
+		/// <summary>
+		/// 结束时间
+		/// </summary>
+		public DateTime? EndTime { get; set; }
+	}
+}

Edu.Model/ViewModel/Exam/RB_StuWords_Prep_Extend.cs

+
+using Edu.Model.Entity.Exam;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Exam
+{
+    /// <summary>
+    /// 学员单词预习扩展实体类
+    /// </summary>
+    public class RB_StuWords_Prep_Extend: RB_StuWords_Prep
+    {
+        /// <summary>
+        /// 学习分钟数
+        /// </summary>
+        public string StartMinutes
+        {
+            get
+            {
+                string str = "";
+                if (this.StartTime != null && this.EndTime != null)
+                {
+                    str = Common.ConvertHelper.CalcMinutes(Convert.ToDateTime(this.StartTime), Convert.ToDateTime(this.EndTime)).ToString();
+                }
+                return str;
+            }
+        }
+    }
+}

Edu.Model/ViewModel/Exam/RB_StuWords_Review_Extend.cs

+using Edu.Model.Entity.Exam;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Exam
+{
+    /// <summary>
+    /// 学员单词扩展复习实体类
+    /// </summary>
+    public class RB_StuWords_Review_Extend : RB_StuWords_Review
+    {
+
+    }
+}

Edu.Module.Course/ClassModule.cs

@@ -4903,7 +4903,10 @@ namespace Edu.Module.Course
             return new
             {
                 NextWord = NextNum,
-                ReviewWord = ReviewNum
+                NextCourseNo,
+                ReviewWord = ReviewNum,
+                ReviewCourseNo,
+                CourseId= courseId
             };
         }
 

Edu.Module.Exam/PaperModule.cs

@@ -1242,7 +1242,7 @@ namespace Edu.Module.Exam
             if (model.ExamEndTime < DateTime.Now)
             {
                 fileds.Add(nameof(RB_Examination_Publish_ViewModel.ExamineStatus), (int)EduTaskRrocessStatus.Invalid);
-                fileds.Add(nameof(RB_Examination_Publish_ViewModel.PublishRemark), "考试时间一超过当前时间，更新为作废");
+                fileds.Add(nameof(RB_Examination_Publish_ViewModel.PublishRemark), "考试时间已超过当前时间，更新为作废");
                 flag = examination_PublishRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Publish_ViewModel.Id), model.Id));
                 return flag;
             }

Edu.Repository/Exam/RB_StuWords_PrepRepository.cs

+using Edu.Model.Entity.Exam;
+using Edu.Model.ViewModel.Exam;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Edu.Repository.Exam
+{
+    /// <summary>
+    /// 学员单词预习仓储层
+    /// </summary>
+    public class RB_StuWords_PrepRepository : BaseRepository<RB_StuWords_Prep>
+    {
+
+        /// <summary>
+        /// 获取单词预习列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_StuWords_Prep_Extend> GetStuWordsPrepListRepository(RB_StuWords_Prep_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT A.* FROM RB_StuWords_Prep AS A WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_StuWords_Prep_Extend.Group_Id), query.Group_Id);
+                }
+                if (query.CourseId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_StuWords_Prep_Extend.CourseId), query.CourseId);
+                }
+                if (query.ChapterId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_StuWords_Prep_Extend.ChapterId), query.ChapterId);
+                }
+                if (query.Stu_Account_Id > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_StuWords_Prep_Extend.Stu_Account_Id), query.Stu_Account_Id);
+                }
+            }
+            return Get<RB_StuWords_Prep_Extend>(builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 获取单词预习分页列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_StuWords_Prep_Extend> GetStuWordsPrepPageRepository(int pageIndex,int pageSize,out long rowsCount, RB_StuWords_Prep_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT A.* FROM RB_StuWords_Prep AS A WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_StuWords_Prep_Extend.Group_Id), query.Group_Id);
+                }
+                if (query.CourseId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_StuWords_Prep_Extend.CourseId), query.CourseId);
+                }
+                if (query.ChapterId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_StuWords_Prep_Extend.ChapterId), query.ChapterId);
+                }
+                if (query.Stu_Account_Id > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_StuWords_Prep_Extend.Stu_Account_Id), query.Stu_Account_Id);
+                }
+            }
+            return GetPage<RB_StuWords_Prep_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+        }
+    }
+}

Edu.Repository/Exam/RB_StuWords_ReviewRepository.cs

+using Edu.Model.Entity.Exam;
+using Edu.Model.ViewModel.Exam;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Edu.Repository.Exam
+{
+    /// <summary>
+    /// 学员单词复习仓储层
+    /// </summary>
+    public class RB_StuWords_ReviewRepository : BaseRepository<RB_StuWords_Review>
+    {
+        /// <summary>
+        /// 获取单词复习列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_StuWords_Review_Extend> GetStuWordsReviewListRepository(RB_StuWords_Review_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT A.* FROM RB_StuWords_Prep AS A WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_StuWords_Review_Extend.Group_Id), query.Group_Id);
+                }
+                if (query.CourseId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_StuWords_Review_Extend.CourseId), query.CourseId);
+                }
+                if (query.ChapterId > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_StuWords_Review_Extend.ChapterId), query.ChapterId);
+                }
+                if (query.Stu_Account_Id > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_StuWords_Review_Extend.Stu_Account_Id), query.Stu_Account_Id);
+                }
+            }
+            return Get<RB_StuWords_Review_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Edu.Repository/User/RB_StudentRepository.cs

@@ -278,6 +278,7 @@ WHERE 1=1
                     {
                         builder.AppendFormat(" AND t.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId={0} AND `Status`=0) ", query.CreateBy);
                     }
+                    //我下属的
                     if (query.BelongType == 4 )
                     {
                         if (query.CreateIds != null && query.CreateIds.Count > 0)
@@ -285,7 +286,7 @@ WHERE 1=1
                             string createIds = string.Join(",", query.CreateIds);
                             if (!string.IsNullOrEmpty(createIds))
                             {
-                                builder.AppendFormat(" AND t.{0} IN({1}) ", nameof(RB_Student_ViewModel.CreateBy), createIds);
+                                builder.AppendFormat(" AND (t.{0} IN({1}) OR t.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId IN({1}) AND `Status`=0)) ", nameof(RB_Student_ViewModel.CreateBy), createIds);
                             }
                         }
                         else

Edu.WebApi/Controllers/Applet/AppletIndexController.cs

@@ -307,11 +307,15 @@ namespace Edu.WebApi.Controllers.Applet
             {
                 Words = classModule.GetIndexWords(studentModel.ClassId, studentModel.CourseId, appletUserInfo.Group_Id);
             }
-            else {
+            else 
+            {
                 Words = new
                 {
                     NextWord = 0,
-                    ReviewWord = 0
+                    ReviewWord = 0,
+                    NextCourseNo=0,
+                    ReviewCourseNo=0,
+                    CourseId=0,
                 };
             }
 

Edu.WebApi/Controllers/Applet/AppletWordsController.cs

+using Edu.Common.API;
+using Edu.Common.Plugin;
+using Edu.Model.ViewModel.Exam;
+using Edu.Module.Exam;
+using Edu.WebApi.Filter;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Edu.WebApi.Controllers.Applet
+{
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class AppletWordsController : AppletBaseController
+    {
+        private readonly CourseExamModule courseExamModule = new CourseExamModule();
+
+        /// <summary>
+        /// 获取今日学习单词列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetStudyWords()
+        {
+            var CourseId = base.ParmJObj.GetInt("CourseId");
+            var ChapterId = base.ParmJObj.GetInt("ChapterId");
+            var PrevChapterId = base.ParmJObj.GetInt("PrevChapterId");
+            var list = courseExamModule.GetStudyCourseWords(CourseId, ChapterId, PrevChapterId);
+            return ApiResult.Success(data: list);
+        }
+ 
+
+        /// <summary>
+        /// 新增修改学员学习
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetStuWordsPrep()
+        {
+            var model = new RB_StuWords_Prep_Extend()
+            {
+                Id = base.ParmJObj.GetInt("Id"),
+                ClassId = base.ParmJObj.GetInt("ClassId"),
+                CourseId = base.ParmJObj.GetInt("CourseId"),
+                Stu_Account_Id = base.ParmJObj.GetInt("Stu_Account_Id"),
+                ChapterId=base.ParmJObj.GetInt("ChapterId"),
+                StudyNum=base.ParmJObj.GetInt("StudyNum"),
+            };
+            model.CreateBy = base.AppletUserInfo.Id;
+            model.CreateTime = DateTime.Now;
+            model.School_Id = 0;
+            model.Group_Id = base.AppletUserInfo.Group_Id;
+            model.Status = Common.Enum.DateStateEnum.Normal;
+            bool flag = courseExamModule.SetStuWordsPrepModule(model);
+            return flag ? ApiResult.Success(data:model) : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 新增修改学员复习
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetStuWordsReview()
+        {
+            var model = new RB_StuWords_Review_Extend()
+            {
+                Id = base.ParmJObj.GetInt("Id"),
+                ClassId = base.ParmJObj.GetInt("ClassId"),
+                CourseId = base.ParmJObj.GetInt("CourseId"),
+                Stu_Account_Id = base.ParmJObj.GetInt("Stu_Account_Id"),
+                ChapterId = base.ParmJObj.GetInt("ChapterId"),
+                ReviewNum = base.ParmJObj.GetInt("ReviewNum"),
+            };
+            model.CreateBy = base.AppletUserInfo.Id;
+            model.CreateTime = DateTime.Now;
+            model.School_Id = 0;
+            model.Group_Id = base.AppletUserInfo.Group_Id;
+            model.Status = Common.Enum.DateStateEnum.Normal;
+            bool flag = courseExamModule.SetStuWordsReviewModule(model);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 生成学员单词测试
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult CreateCourseExam()
+        {
+            var CourseId = base.ParmJObj.GetInt("CourseId");
+            var ChapterId = base.ParmJObj.GetInt("ChapterId");
+            var NextChapterId = base.ParmJObj.GetInt("NextChapterId");
+            var obj = courseExamModule.CreateCourseExamModule(CourseId, ChapterId, NextChapterId);
+            return ApiResult.Success(data: obj);
+        }
+    }
+}

Edu.WebApi/Controllers/Course/StuController.cs

@@ -349,7 +349,7 @@ namespace Edu.WebApi.Controllers.Course
                 {
                     item.Id,
                     item.GuestName,
-                    Mobile=item.StuTel,
+                    Mobile=item.StuRealMobile,
                     item.ContractId,
                     item.ContractNo,
                     item.ClassId,