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

.gitignore

@@ -7,3 +7,4 @@ Edu.WebApi/Properties
 Edu.WebApi/SearchIndex
 /Properties
 *.user
+Edu.WebApi/RateLimitConfig.json

Edu.Common/Enum/Course/CourseRateEnum.cs

@@ -11,7 +11,6 @@ namespace Edu.Common.Enum.Course
     public enum CourseRateEnum
     {
         
-
         /// <summary>
         /// 基础课程
         /// </summary>
@@ -60,4 +59,29 @@ namespace Edu.Common.Enum.Course
         [EnumField("其他")]
         OTHER = 8,
     }
+
+    /// <summary>
+    /// 所属科目
+    /// </summary>
+    public enum CourseSubjectEnum
+    {
+
+        /// <summary>
+        /// 日语
+        /// </summary>
+        [EnumField("日语")]
+        Japanese = 1,
+
+        /// <summary>
+        /// 韩语
+        /// </summary>
+        [EnumField("韩语")]
+        Korean =2,
+
+        /// <summary>
+        /// 新媒体
+        /// </summary>
+        [EnumField("新媒体")]
+        NewMedia =3
+}
 }

Edu.Model/Entity/Course/RB_Course.cs

@@ -141,5 +141,10 @@ namespace Edu.Model.Entity.Course
         /// 课程等级
         /// </summary>
         public CourseRateEnum CourseRate { get; set; }
+
+        /// <summary>
+        /// 所属科目
+        /// </summary>
+        public CourseSubjectEnum CourseSubject { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Course_Offer_ViewModel.cs

-using Edu.Model.Entity.Course;
+using Edu.Common.Enum.Course;
+using Edu.Common.Plugin;
+using Edu.Model.Entity.Course;
 using System;
 using System.Collections.Generic;
 using System.Text;

Edu.Model/ViewModel/Course/RB_Course_ViewModel.cs

 using Edu.Common;
+using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Mall;
 using Edu.Model.ViewModel.User;
 using System;
@@ -158,5 +159,16 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public List<RB_Goods_Category_Extend> CategoryList { get; set; }
 
+
+        /// <summary>
+        /// 课程等级
+        /// </summary>
+        public string CourseRateName { get { return this.CourseRate.ToName(); } }
+
+        /// <summary>
+        /// 所属科目名称
+        /// </summary>
+        public string CourseSubjectName { get { return this.CourseSubject.ToName(); } }
+
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Grade/RB_Class_FeedBack_ViewModel.cs

@@ -5,7 +5,7 @@ using Edu.Model.Entity.Grade;
 
 namespace Edu.Model.ViewModel.Grade
 {
-   public class RB_Class_FeedBack_ViewModel: RB_Class_FeedBack
+    public class RB_Class_FeedBack_ViewModel : RB_Class_FeedBack
     {
         /// <summary>
         /// ids
@@ -21,5 +21,21 @@ namespace Edu.Model.ViewModel.Grade
         /// 老师名称
         /// </summary>
         public string TeacherName { get; set; }
+        /// <summary>
+        /// 老师头像
+        /// </summary>
+        public string TeacherIcon { get; set; }
+
+        /// <summary>
+        /// 头像列表
+        /// </summary>
+        public List<string> PhotoList { get; set; }
+
+
+        /// <summary>
+        /// 学生id
+        /// </summary>
+        public int StuId { get; set; }
+
     }
 }

Edu.Model/ViewModel/Grade/RB_Class_ViewModel.cs

-using Edu.Model.Entity.Grade;
+using Edu.Common.Enum.Course;
+using Edu.Common.Plugin;
+using Edu.Model.Entity.Grade;
 using Edu.Model.ViewModel.Course;
 using System;
 using System.Collections.Generic;
@@ -247,6 +249,16 @@ namespace Edu.Model.ViewModel.Grade
         /// 开班时间
         /// </summary>
         public List<string> ClassDateList { get; set; }
+
+        /// <summary>
+        /// 所属科目
+        /// </summary>
+        public CourseSubjectEnum CourseSubject { get; set; }
+
+        /// <summary>
+        /// 科目名称
+        /// </summary>
+        public string CourseSubjectName { get { return this.CourseSubject.ToName(); } }
     }
 
     /// <summary>

Edu.Model/ViewModel/Sell/RB_Order_ViewModel.cs

-using Edu.Model.Entity.Sell;
+using Edu.Common.Enum.Course;
+using Edu.Common.Plugin;
+using Edu.Model.Entity.Sell;
 using Edu.Model.ViewModel.Contract;
 using System;
 using System.Collections.Generic;
@@ -242,5 +244,15 @@ namespace Edu.Model.ViewModel.Sell
         /// 订单拆分列表
         /// </summary>
         public List<RB_Order_SplitDetails_ViewModel> SplitDetailsList { get; set; }
+
+        /// <summary>
+        /// 所属科目
+        /// </summary>
+        public CourseSubjectEnum CourseSubject { get; set; }
+
+        /// <summary>
+        /// 科目名称
+        /// </summary>
+        public string CourseSubjectName { get { return this.CourseSubject.ToName(); } }
     }
 }
\ No newline at end of file

Edu.Module.Course/CourseModule.cs

@@ -295,6 +295,7 @@ namespace Edu.Module.Course
                     {nameof(RB_Course_ViewModel.IsKCourse),model.IsKCourse },
                     {nameof(RB_Course_ViewModel.ClassHours),model.ClassHours },
                     {nameof(RB_Course_ViewModel.CourseRate),model.CourseRate },
+                    {nameof(RB_Course_ViewModel.CourseSubject),model.CourseSubject },
                 };
                 flag = courseRepository.Update(fileds, new WhereHelper(nameof(RB_Course_ViewModel.CourseId), model.CourseId));
             }

Edu.Module.Course/OrderModule.cs

@@ -3277,7 +3277,7 @@ namespace Edu.Module.Course
                         IsPublic = 1,
                         BType = 1,//item.AccountType,
                         AccountId = financeConfig?.ClientID ?? 54,
-                        WBMoney = Convert.ToDecimal(demodel.PreferPrice),
+                        WBMoney = Convert.ToDecimal(demodel.PreferPrice- demodel.PlatformTax),
                         TradeDate = System.DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"),
                         AccountNumber = System.DateTime.Now.AddDays(-1).ToString("yyyyMMdd"),
                         TemplateId = financeConfig?.TempleteId ?? 139,

Edu.Repository/Course/RB_CourseRepository.cs

@@ -77,6 +77,11 @@ WHERE 1=1
                         builder.AppendFormat("  AND ({0}) ", str);
                     }
                 }
+                //所属科目
+                if (query.CourseSubject > 0)
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Course_ViewModel.CourseSubject), (int)query.CourseSubject);
+                }
             }
             return Get<RB_Course_ViewModel>(builder.ToString(), parameters).ToList();
         }
@@ -144,6 +149,11 @@ WHERE 1=1
                         builder.AppendFormat("  AND ({0}) ", str);
                     }
                 }
+                //所属科目
+                if (query.CourseSubject > 0)
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Course_ViewModel.CourseSubject), (int)query.CourseSubject);
+                }
             }
            return GetPage<RB_Course_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }

Edu.Repository/Duty/RB_Duty_ContentRepository.cs

@@ -55,6 +55,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(@" AND FIND_IN_SET('{0}', A.HandoverDlandetails)>0 ", query.HandoverDlandetails);
                 }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Duty_Content_ViewModel.CreateBy), query.CreateBy);
+                }
             }
             return Get<RB_Duty_Content_ViewModel>(builder.ToString()).ToList();
         }

Edu.Repository/Grade/RB_ClassRepository.cs

@@ -214,7 +214,7 @@ WHERE 1=1
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT A.*,B.CourseName,C.AssistName,IFNULL(C.AssistIcon,'') AS AssistIcon,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead
-       ,E.SName AS SchoolName,IFNULL(F.RoomName,'') AS RoomName,plan.TotalPlanNum,ySplan.UsePlanNum
+       ,E.SName AS SchoolName,IFNULL(F.RoomName,'') AS RoomName,plan.TotalPlanNum,ySplan.UsePlanNum,B.CourseSubject
 FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
      LEFT JOIN rb_assist AS C ON A.Assist_Id=C.AId
      LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId
@@ -291,6 +291,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND D.{0}={1} ", nameof(RB_Teacher_ViewModel.TId), query.Teacher_Id);
                 }
+                if (query.CourseSubject > 0)
+                {
+                    builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_Class_ViewModel.CourseSubject), (int)query.CourseSubject);
+                }
             }
             return GetPage<RB_Class_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
@@ -331,6 +335,7 @@ WHERE A.ClassId={0}
             builder.AppendFormat(@"
 SELECT A.*,B.CourseName,B.CourseFeature,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead,E.SName AS SchoolName,R.RoomName
        ,IFNULL(t.GuestNum,0) AS OrderStudentCount,IFNULL(B.SellPrice,0) AS CourseSellPrice,IFNULL(B.OriginalPrice,0) AS CourseOriginalPrice 
+       ,B.CourseSubject
 FROM rb_class AS A  LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
      LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId
      LEFT JOIN rb_class_room AS R ON A.ClassRoomId=R.RoomId
@@ -346,6 +351,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Group_Id), query.Group_Id);
                 }
+                if (query.CourseSubject > 0)
+                {
+                    builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_Class_ViewModel.CourseSubject), (int)query.CourseSubject);
+                }
                 if (query.School_Id > -1)
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.School_Id), query.School_Id);

Edu.Repository/Grade/RB_Class_FeedBackRepository.cs

 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using Edu.Model.Entity.Grade;
+using Edu.Model.ViewModel.Grade;
 
 namespace Edu.Repository.Grade
 {
-  public  class RB_Class_FeedBackRepository:BaseRepository<RB_Class_FeedBack>
+    /// <summary>
+    /// 上课反馈记录表
+    /// </summary>
+    public class RB_Class_FeedBackRepository : BaseRepository<RB_Class_FeedBack>
     {
+        /// <summary>
+        /// 获取班级反馈列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_FeedBack_ViewModel> GetClassFeedBackList(RB_Class_FeedBack_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"  SELECT A.*,b.TeacherName,b.TeacherHead as TeacherIcon FROM RB_Class_FeedBack AS A  LEFT JOIN rb_teacher as b on a.CreateBy=b.TId WHERE 1=1  ");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_FeedBack_ViewModel.Group_Id), query.Group_Id);
+                }
+               
+                if (query.ClassId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_FeedBack_ViewModel.ClassId), query.ClassId);
+                }
+                if (query.FeedBackId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_FeedBack_ViewModel.FeedBackId), query.FeedBackId);
+                }
+                if (query.OrderGuestId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_FeedBack_ViewModel.OrderGuestId), query.OrderGuestId);
+                }
+                if (!string.IsNullOrEmpty(query.Q_ClassIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Class_FeedBack_ViewModel.ClassId), query.Q_ClassIds);
+                }
+                if (!string.IsNullOrEmpty(query.Q_ClassTimeIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Class_FeedBack_ViewModel.ClassTimeId), query.Q_ClassTimeIds);
+                }
+                if (query.ClassTimeId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_FeedBack_ViewModel.ClassTimeId), query.ClassTimeId);
+                }
+                if (query.ClassPlanId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_FeedBack_ViewModel.ClassPlanId), query.ClassPlanId);
+                }
+                if (!string.IsNullOrWhiteSpace(query.Q_ClassTimeIds))
+                {
+                    builder.AppendFormat(" AND A.{0} in ({1}) ", nameof(RB_Class_FeedBack_ViewModel.ClassTimeId), query.Q_ClassTimeIds);
+                }
+            }
+            return Get<RB_Class_FeedBack_ViewModel>(builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取班级反馈分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_FeedBack_ViewModel> GetClassFeedBackPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Class_FeedBack_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" SELECT A.*,b.TeacherName,b.TeacherHead as TeacherIcon FROM RB_Class_FeedBack AS A  LEFT JOIN rb_teacher as b on a.TeacherId=b.TId 
+LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.OrderGuestId
+LEFT JOIN rb_student as s on s.StuId = sog.Student_Id where  1=1 and a.`Status`=0 and sog.`Status`=0 and s.`Status`=0");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Class_FeedBack_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (query.ClassTimeId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Class_FeedBack_ViewModel.ClassTimeId), query.ClassTimeId);
+                }
+                if (query.ClassId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Class_FeedBack_ViewModel.ClassId), query.ClassId);
+                }
+                if (query.OrderGuestId > 0)
+                {
+                    builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Class_FeedBack_ViewModel.OrderGuestId), query.OrderGuestId);
+                }
+                if (query.StuId > 0)
+                {
+                    builder.AppendFormat(" AND s.{0}={1} ", nameof(RB_Class_FeedBack_ViewModel.StuId), query.StuId);
+                }
+            }
+
+            builder.AppendFormat("  ORDER BY a.CreateTime desc ");
+            return GetPage<RB_Class_FeedBack_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+        }
 
     }
 }

Edu.Repository/Sell/RB_OrderRepository.cs

@@ -252,6 +252,10 @@ ORDER BY {orderBy}
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.HelpEnterId)} = {demodel.HelpEnterId}";
             }
+            if (demodel.CourseSubject > 0)
+            {
+                where += $@" and course.{nameof(RB_Order_ViewModel.CourseSubject)} = {(int)demodel.CourseSubject}";
+            }
             string orderBy = " o.OrderId asc";
             if (demodel.Q_OrderBy == 1)
             {
@@ -263,7 +267,8 @@ ORDER BY {orderBy}
             }
 
             string sql = $@" 
-select o.*,c.ClassName,c.ClassNo,c.School_Id as ClassSchoolId,t.TeacherName,t.TeacherIcon,IFNULL(course.CourseName,'') AS CourseName,C.OpenTime
+select o.*,c.ClassName,c.ClassNo,c.School_Id as ClassSchoolId,t.TeacherName,t.TeacherIcon,IFNULL(course.CourseName,'') AS CourseName
+       ,C.OpenTime,course.CourseSubject
 from RB_Order o 
 left join rb_class c on o.ClassId = c.ClassId
 left join rb_teacher t on c.Teacher_Id = t.TId
@@ -364,18 +369,24 @@ where {where} order by {orderBy}
                 {
                     where += $@" and o.{nameof(RB_Order_ViewModel.PreferPrice)} > (o.{nameof(RB_Order_ViewModel.Income)} - o.{nameof(RB_Order_ViewModel.Refund)} + o.{nameof(RB_Order_ViewModel.PlatformTax)} + o.{nameof(RB_Order_ViewModel.DiscountMoney)}) ";
                 }
+
             }
 
-            string sql = $@" select SUM(CASE WHEN o.OrderState <> 3 THEN o.PreferPrice ELSE 0 END) AS PreferPrice,
-SUM(CASE WHEN o.OrderState <> 3 THEN o.Income ELSE 0 END) AS Income,
-SUM(CASE WHEN o.OrderState <> 3 THEN o.PreferPrice - o.Income + o.Refund - o.DiscountMoney - o.PlatformTax ELSE 0 END) AS DueInMoney,
-SUM(CASE WHEN o.OrderState <> 3 THEN o.GuestNum ELSE 0 END) AS GuestNum,
-SUM(CASE WHEN o.OrderState = 3 THEN o.GuestNum ELSE 0 END) AS CancelNum,
-SUM(CASE WHEN o.CommissionMoney <> -1 AND o.OrderState <> 3 THEN o.CommissionMoney ELSE 0 END) AS CommissionMoney,
-SUM(CASE WHEN o.OrderState <> 3 THEN o.ExtraRewardMoney - o.ExtraDeductMoney ELSE 0 END) AS ExtraRewardMoney
- from RB_Order o 
-left join rb_class c on o.ClassId = c.ClassId
-where {where}
+            if (demodel.CourseSubject > 0)
+            {
+                where += $@" and course.{nameof(RB_Order_ViewModel.CourseSubject)} = {(int)demodel.CourseSubject}";
+            }
+            string sql = $@"
+SELECT SUM(CASE WHEN o.OrderState <> 3 THEN o.PreferPrice ELSE 0 END) AS PreferPrice,
+       SUM(CASE WHEN o.OrderState <> 3 THEN o.Income ELSE 0 END) AS Income,
+       SUM(CASE WHEN o.OrderState <> 3 THEN o.PreferPrice - o.Income + o.Refund - o.DiscountMoney - o.PlatformTax ELSE 0 END) AS DueInMoney,
+       SUM(CASE WHEN o.OrderState <> 3 THEN o.GuestNum ELSE 0 END) AS GuestNum,
+       SUM(CASE WHEN o.OrderState = 3 THEN o.GuestNum ELSE 0 END) AS CancelNum,
+       SUM(CASE WHEN o.CommissionMoney <> -1 AND o.OrderState <> 3 THEN o.CommissionMoney ELSE 0 END) AS CommissionMoney,
+       SUM(CASE WHEN o.OrderState <> 3 THEN o.ExtraRewardMoney - o.ExtraDeductMoney ELSE 0 END) AS ExtraRewardMoney
+FROM RB_Order o LEFT JOIN rb_class c on o.ClassId = c.ClassId
+     LEFT JOIN rb_course AS course ON (o.CourseId=course.CourseId AND o.CourseId>0 AND o.OrderType=1) 
+WHERE {where}
 ";
             return Get<RB_Order_ViewModel>(sql).FirstOrDefault();
         }

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -131,7 +131,7 @@ namespace Edu.Repository.Sell
             }
 
             string sql = $@" 
-SELECT sog.Student_Id as StudentId,A.*,cs.ClassName,cs.ClassNo,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS TargetJoinType,IFNULL(B.StartClassHours,0) AS StartClassHours
+SELECT sog.Student_Id as StudentId,A.*,cs.ClassName,cs.Teacher_Id,cs.ClassNo,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS TargetJoinType,IFNULL(B.StartClassHours,0) AS StartClassHours
        ,IFNULL(C.CourseName,'') AS CourseName,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId,B.EnterID
        ,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId,IFNULL(D.FirstClassHours,0)+IFNULL(D.SecondClassHours,0)+IFNULL(D.ThirdClassHours,0) AS ContractTotalHours
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId

Edu.WebApi/Controllers/Applet/AppletIndexController.cs

@@ -113,8 +113,8 @@ namespace Edu.WebApi.Controllers.Applet
             List<Model.ViewModel.Exam.RB_Examination_Publish_ViewModel> examinationPublishList = new List<Model.ViewModel.Exam.RB_Examination_Publish_ViewModel>();
             if (studentModel != null && studentModel.GuestId > 0)
             {
-                examinationPublishList = paperModule.GetGuestExaminationPublishPage(1, 5, out long rowsCount, 
-                    new RB_Examination_Publish_ViewModel { QAccountIds= appletUserInfo.Id.ToString(), Group_Id = studentModel.Group_Id });
+                examinationPublishList = paperModule.GetGuestExaminationPublishPage(1, 5, out long rowsCount,
+                    new RB_Examination_Publish_ViewModel { QAccountIds = appletUserInfo.Id.ToString(), Group_Id = studentModel.Group_Id });
                 if (examinationPublishList == null)
                 {
                     examinationPublishList = new List<Model.ViewModel.Exam.RB_Examination_Publish_ViewModel>();
@@ -147,6 +147,16 @@ namespace Edu.WebApi.Controllers.Applet
             }
             #endregion
 
+
+            #region 获取最新一条上课反馈记录
+            long count = 0;
+            var feedBackList = classModule.GetClassFeedBackPageListRepository(1, 1, out count, new RB_Class_FeedBack_ViewModel { StuId = appletUserInfo.AccountId, Group_Id = appletUserInfo.Group_Id });
+            if (feedBackList != null && feedBackList.Any())
+            {
+                feedBackList.ForEach(x => x.PhotoList = (!string.IsNullOrWhiteSpace(x.Photo) ? JsonHelper.DeserializeObject<List<string>>(x.Photo) : new List<string>()));
+            }
+            #endregion
+
             var result = new
             {
                 studentModel.SName,//学区
@@ -157,6 +167,7 @@ namespace Edu.WebApi.Controllers.Applet
                 studentModel.ClassName,
                 studentModel.CourseId,
                 studentModel.GuestId,
+                FeedBackList = feedBackList,//上课反馈最新一条数据
                 EnterPhone = Cache.User.UserReidsCache.GetUserLoginInfo(studentModel.EnterID).UserMobile,
                 ContractNum = (((contractList != null && contractList.Any()) ? contractList.Count() : 0) + ((backClassList != null && backClassList.Any()) ? backClassList.Count() : 0)),//合同数
                 ClassPlan = new //我的课表最新一个数据
@@ -533,7 +544,7 @@ namespace Edu.WebApi.Controllers.Applet
                 }
                 else if (item.ExamStartTime < System.DateTime.Now && item.ExamEndTime > System.DateTime.Now)
                 {
-                    if (item.ExamStatus != ExamTestStatusEnum.FinishTest &&item.ExamStatus!= ExamTestStatusEnum.FinishScoring )
+                    if (item.ExamStatus != ExamTestStatusEnum.FinishTest && item.ExamStatus != ExamTestStatusEnum.FinishScoring)
                     {
                         item.ExamStatus = ExamTestStatusEnum.FinishStarted;
                     }
@@ -558,7 +569,7 @@ namespace Edu.WebApi.Controllers.Applet
                 ExamEndTime = Common.ConvertHelper.FormatTime(x.ExamEndTime),
                 x.ExamTimes,
                 x.ExamStatus,
-                ExamStatusStr=x.ExamStatus.ToName()
+                ExamStatusStr = x.ExamStatus.ToName()
             });
             pageModel.Count = rowsCount;
             return ApiResult.Success(data: pageModel);
@@ -693,9 +704,11 @@ namespace Edu.WebApi.Controllers.Applet
                     item.Title,
                     item.Content,
                     item.Img,
+                    Ico = "",
                     item.Digest,
                     item.LinkUrl,
                     CreateByName,
+                    item.TypeId,
                     CreateTime = Common.Plugin.StringHelper.DateFormatToString(item.CreateDate)
                 });
             }
@@ -731,11 +744,58 @@ namespace Edu.WebApi.Controllers.Applet
                     extModel.Digest,
                     extModel.LinkUrl,
                     CreateByName,
-                    CreateTime = Common.Plugin.StringHelper.DateFormatToString(extModel.CreateDate)
+                    extModel.TypeId,
+                    CreateTime = Common.Plugin.StringHelper.DateFormatToString(extModel.CreateDate),
+                    Ico = UserReidsCache.GetUserLoginInfo(extModel.CreateBy)?.UserIcon ?? ""
                 };
             }
             return ApiResult.Success(data: obj);
         }
         #endregion
+
+
+        #region 上课反馈记录
+        /// <summary>
+        /// 获取学习园地分页
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+
+        public ApiResult GeClassFeedBackPage()
+        {
+            var appletUserInfo = base.AppletUserInfo;
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var query = new RB_Class_FeedBack_ViewModel()
+            {
+
+                Group_Id = appletUserInfo.Group_Id,
+                StuId = appletUserInfo.AccountId,
+            };
+            var list = classModule.GetClassFeedBackPageListRepository(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+
+            if (list != null && list.Any())
+            {
+                list.ForEach(x => x.PhotoList = (!string.IsNullOrWhiteSpace(x.Photo) ? JsonHelper.DeserializeObject<List<string>>(x.Photo) : new List<string>()));
+            }
+            List<object> resultList = new List<object>();
+            foreach (var item in list)
+            {
+                resultList.Add(new
+                {
+                    item.FeedBackId,
+                    item.TeacherIcon,
+                    item.TeacherName,
+                    item.PhotoList,
+                    item.Comment,
+                    item.Score,
+                    CreateTimeYear = item.CreateTime.ToString("yyyy"),
+                    CreatetimeStr = item.CreateTime.ToString("MM-dd HH:mm:ss")
+                });
+            }
+            pageModel.Count = rowsCount;
+            pageModel.PageData = resultList;
+            return ApiResult.Success(data: pageModel);
+        }
+        #endregion
     }
 }

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -54,7 +54,8 @@ namespace Edu.WebApi.Controllers.Course
                 School_Id = base.ParmJObj.GetInt("School_Id"),
                 TeacherName = base.ParmJObj.GetStringValue("TeacherName"),
                 CourseName = base.ParmJObj.GetStringValue("CourseName"),
-                ClassNo = base.ParmJObj.GetStringValue("ClassNo")
+                ClassNo = base.ParmJObj.GetStringValue("ClassNo"),
+                CourseSubject=(CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             List<object> result = new List<object>();
@@ -94,6 +95,8 @@ namespace Edu.WebApi.Controllers.Course
                     item.FinishTimeStr,
                     item.UsePlanNum,
                     item.TotalPlanNum,
+                    item.CourseSubject,
+                    item.CourseSubjectName,
                 });
             }
             pageModel.Count = rowsCount;

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -191,6 +191,7 @@ namespace Edu.WebApi.Controllers.Course
                 IsQPrice = base.ParmJObj.GetInt("IsQPrice"),
                 IsQTeacher = base.ParmJObj.GetInt("IsQTeacher"),
                 Saleplat = base.ParmJObj.GetStringValue("Saleplat"),
+                CourseSubject=(CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             //query.School_Id = base.UserInfo.School_Id;
@@ -223,6 +224,7 @@ namespace Edu.WebApi.Controllers.Course
             var query = new RB_Course_ViewModel()
             {
                 IsQPrice = base.ParmJObj.GetInt("IsQPrice", 0),
+                CourseSubject=(CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             query.School_Id = base.UserInfo.School_Id;
@@ -283,6 +285,7 @@ namespace Edu.WebApi.Controllers.Course
                 IsKCourse = base.ParmJObj.GetInt("IsKCourse"),
                 ClassHours = base.ParmJObj.GetDecimal("ClassHours"),
                 CourseRate = (CourseRateEnum)base.ParmJObj.GetInt("CourseRate"),
+                CourseSubject = (CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
             };
             try
             {
@@ -572,6 +575,17 @@ namespace Edu.WebApi.Controllers.Course
             return ApiResult.Success(data: list);
         }
 
+        /// <summary>
+        /// 获取课程科目列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetCourseSubjectList()
+        {
+            var list = Common.Plugin.EnumHelper.EnumToList(typeof(CourseSubjectEnum));
+            return ApiResult.Success(data: list);
+        }
+
         /// <summary>
         /// 删除课程章节
         /// </summary>

Edu.WebApi/Controllers/Course/CourseOfferController.cs

 using Edu.Cache.User;
 using Edu.Common.API;
+using Edu.Common.Enum.Course;
 using Edu.Common.Enum.Sale;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -51,7 +51,8 @@ namespace Edu.WebApi.Controllers.Course
                 CouseId = base.ParmJObj.GetInt("CouseId"),
                 Q_CanApply = base.ParmJObj.GetInt("Q_CanApply"),
                 JoinStartTime = base.ParmJObj.GetStringValue("JoinStartTime"),
-                JoinEndTime = base.ParmJObj.GetStringValue("JoinEndTime")
+                JoinEndTime = base.ParmJObj.GetStringValue("JoinEndTime"),
+                CourseSubject=(CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
             };
             dmodel.School_Id = -1;
             var schoolId = base.ParmJObj.GetStringValue("School_Id");
@@ -112,6 +113,8 @@ namespace Edu.WebApi.Controllers.Course
                     UpdateTime = Common.ConvertHelper.FormatTime(x.UpdateTime),
                     x.OtherCourseList,
                     IsChaBan = IsInsertClass,
+                    x.CourseSubject,
+                    x.CourseSubjectName,
                 };
                 result.Add(obj);
             }
@@ -1237,6 +1240,7 @@ namespace Edu.WebApi.Controllers.Course
                 Q_OrderState = base.ParmJObj.GetInt("Q_OrderState"),
                 Q_OrderBy = base.ParmJObj.GetInt("Q_OrderBy"),
                 PlatformTax = base.ParmJObj.GetDecimal("PlatformTax"),
+                CourseSubject=(CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
             };
             demodel.Group_Id = userInfo.Group_Id;
             demodel.EnterID = userInfo.Id;
@@ -1322,6 +1326,8 @@ namespace Edu.WebApi.Controllers.Course
                     x.RenewOrderId,
                     x.FirstOrderId,
                     x.IsBackClass,
+                    x.CourseSubject,
+                    x.CourseSubjectName,
                     SplitDetailsList = x?.SplitDetailsList?.Select(qitem => new
                     {
                         qitem.S_ClassId,
@@ -1418,7 +1424,8 @@ namespace Edu.WebApi.Controllers.Course
                 PlatformTax = base.ParmJObj.GetDecimal("PlatformTax"),
                 EnterID = base.ParmJObj.GetInt("EnterID"),
                 HelpEnterId = base.ParmJObj.GetInt("HelpEnterId", 0),
-                ClassNo = base.ParmJObj.GetStringValue("ClassNo")
+                ClassNo = base.ParmJObj.GetStringValue("ClassNo"),
+                CourseSubject=(CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
             };
             demodel.Group_Id = userInfo.Group_Id;
 
@@ -1503,6 +1510,8 @@ namespace Edu.WebApi.Controllers.Course
                     x.RenewOrderId,
                     x.FirstOrderId,
                     x.IsBackClass,
+                    x.CourseSubject,
+                    x.CourseSubjectName,
                     SplitDetailsList = x?.SplitDetailsList?.Select(qitem => new
                     {
                         qitem.S_ClassId,

Edu.WebApi/Controllers/Course/TeacherClassController.cs

@@ -16,6 +16,7 @@ using Edu.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json.Linq;
 
 namespace Edu.WebApi.Controllers.Course
 {
@@ -52,6 +53,7 @@ namespace Edu.WebApi.Controllers.Course
                 School_Id = base.ParmJObj.GetInt("School_Id"),
                 TeacherName = base.ParmJObj.GetStringValue("TeacherName"),
                 CourseName = base.ParmJObj.GetStringValue("CourseName"),
+                CourseSubject = (CourseSubjectEnum)base.ParmJObj.GetInt("CourseSubject"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             List<object> result = new List<object>();
@@ -90,6 +92,8 @@ namespace Edu.WebApi.Controllers.Course
                     item.CouseId,
                     item.FinishTimeStr,
                     item.OrderStudentCount,
+                    item.CourseSubject,
+                    item.CourseSubjectName,
                 });
             }
             pageModel.Count = rowsCount;
@@ -325,7 +329,141 @@ namespace Edu.WebApi.Controllers.Course
 
 
         #region 上课反馈
+        /// <summary>
+        /// 获取上课详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetFeedBackDetails()
+        {
+            var ID = base.ParmJObj.GetInt("ID", 0);
+            var timeModel = classModule.GetClassTimeList_V2(new RB_Class_Time_ViewModel { ClassTimeId = ID, Group_Id = base.UserInfo.Group_Id }).FirstOrDefault();
+            if (timeModel == null || timeModel.ClassTimeId == 0)
+            {
+                return ApiResult.Failed("班级上课时间信息不存在");
+            }
+            var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = 0, ClassId = timeModel.ClassId });
+
+            var tempOrderGuestList = classModule.GetTempInvitationGuest(new Model.ViewModel.EduTask.RB_Temporary_Invitation_ViewModel { ClassTimeId = ID, ClassId = timeModel.ClassId });
+
+            var allOrderGuestList = new List<RB_Order_Guest_ViewModel>();
+            allOrderGuestList.AddRange(orderGuestList.Where(x => x.GuestState == GuestStateEnum.Normal || x.GuestState == GuestStateEnum.StopClassesApplyIng || ((x.GuestState == GuestStateEnum.StopClasses || x.GuestState == GuestStateEnum.Graduate) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(timeModel.NewPlanDateTime)))));
+
+            var feedBackList = classModule.GetClassFeedBackList(new RB_Class_FeedBack_ViewModel { ClassTimeId = ID, Group_Id = base.UserInfo.Group_Id, ClassId = timeModel.ClassId });
+            if (tempOrderGuestList != null && tempOrderGuestList.Any())
+            {
+                allOrderGuestList.AddRange(tempOrderGuestList.Where(x => x.GuestState == GuestStateEnum.Normal || x.GuestState == GuestStateEnum.StopClassesApplyIng || ((x.GuestState == GuestStateEnum.StopClasses || x.GuestState == GuestStateEnum.Graduate) && x.ClassTimeId == ID && x.ClassId == timeModel.ClassId && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(timeModel.NewPlanDateTime)))));
+            }
+            List<object> result = new List<object>();
+            foreach (var item in allOrderGuestList)
+            {
+                var FeedBackModel = feedBackList.Where(y => y.OrderGuestId == item.Id).FirstOrDefault();
+                if (FeedBackModel != null && FeedBackModel.FeedBackId > 0)
+                {
+                    if (!string.IsNullOrWhiteSpace(FeedBackModel.Photo))
+                    {
+                        FeedBackModel.PhotoList = JsonHelper.DeserializeObject<List<string>>(FeedBackModel.Photo);
+                    }
+                    else {
+                        FeedBackModel.PhotoList = new List<string>();
+                    }
+                }
+                var guest = new
+                {
+                    timeModel.ClassPlanId,
+                    timeModel.ClassId,
+                    timeModel.ClassTimeId,
+                    item.GuestName,
+                    item.Mobile,
+                    item.Teacher_Id,
+                    item.School_Id,
+                    OrderGuestId = item.Id,
+                    Score = FeedBackModel?.Score ?? 0,
+                    Comment = FeedBackModel?.Comment ?? "",
+                    PhotoList = FeedBackModel?.PhotoList ?? new List<string>(),
+                    FeedBackId = FeedBackModel?.FeedBackId ?? 0,
+                    TeacherName = FeedBackModel?.TeacherName ?? "",
+                    TeacherIcon = FeedBackModel?.TeacherIcon ?? "",
+                    CreateTimeStr = (FeedBackModel != null && FeedBackModel.FeedBackId > 0) ? FeedBackModel.CreateTime.ToString("yyyy-MM-dd HH:mm") : ""
+                };
+                result.Add(guest);
+            }
+            return ApiResult.Success("", result);
+        }
 
+        /// <summary>
+        /// 老师上课反馈填写
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetFeedBack()
+        {
+            List<RB_Class_FeedBack_ViewModel> list = new List<RB_Class_FeedBack_ViewModel>();
+            JArray array = JArray.Parse(RequestParm.Msg.ToString());
+            if (array != null && array.Count > 0)
+            {
+                foreach (var jItem in array)
+                {
+                    JObject obj = JObject.Parse(jItem.ToString());
+                    var nowModel = new RB_Class_FeedBack_ViewModel()
+                    {
+                        OrderGuestId = obj.GetInt("OrderGuestId"),
+                        ClassTimeId = obj.GetInt("ClassTimeId"),
+                        ClassPlanId = obj.GetInt("ClassPlanId"),
+                        School_Id = obj.GetInt("School_Id"),
+                        Score = obj.GetInt("Score"),
+                        TeacherId = obj.GetInt("TeacherId"),
+                        ClassId = obj.GetInt("ClassId"),
+                        Comment = obj.GetStringValue("Comment")
+                    };
+                    List<string> photoList = JsonHelper.DeserializeObject<List<string>>(obj.GetStringValue("PhotoList"));
+                    if (photoList != null && photoList.Any())
+                    {
+                        nowModel.Photo = JsonHelper.Serialize(photoList);
+                    }
+                    else
+                    {
+                        nowModel.Photo = "";
+                    }
+                    list.Add(nowModel);
+                }
+            }
+            if (list == null || !list.Any())
+            {
+                return ApiResult.ParamIsNull(message: "请选择上课反馈学员!");
+            }
+
+
+            //判断当天是否有已反馈数据
+            var classFeedBackList = classModule.GetClassFeedBackList(new RB_Class_FeedBack_ViewModel
+            {
+                Group_Id = base.UserInfo.Group_Id,
+                ClassId = list.FirstOrDefault().ClassId,
+                ClassTimeId = list.FirstOrDefault().ClassTimeId,
+            });
+            foreach (var item in list)
+            {
+                var signModel = classFeedBackList?.Where(qitem => qitem.ClassId == item.ClassId && qitem.OrderGuestId == item.OrderGuestId)?.FirstOrDefault();
+                if (signModel != null && signModel.FeedBackId > 0)
+                {
+                    item.FeedBackId = signModel.FeedBackId;
+                    item.Group_Id = signModel.Group_Id;
+                    item.CreateTime = signModel.CreateTime;
+                    item.CreateBy = base.UserInfo.Id;
+                    item.Status = 0;
+                }
+                else
+                {
+                    item.Group_Id = base.UserInfo.Group_Id;
+                    item.CreateTime = System.DateTime.Now;
+                    item.CreateBy = base.UserInfo.Id;
+                    item.Status = 0;
+                }
+            }
+            bool result = classModule.SetFeedBack(list);
+
+            return result ? ApiResult.Success() : ApiResult.Failed("上课反馈失败");
+        }
         #endregion
     }
 }

Edu.WebApi/Controllers/User/LoginController.cs

@@ -186,7 +186,7 @@ namespace Edu.WebApi.Controllers.User
                                 {
                                         {"iat",secondsSinceEpoch2 },
                                         {"exp",secondsSinceEpoch2+Config.JwtExpirTime},
-                                        {"mall_userInfoJH",mallJHUserInfo }
+                                        {"mall_userInfo",mallJHUserInfo }
                                 };
                 JWT.Algorithms.IJwtAlgorithm algorithm2 = new JWT.Algorithms.HMACSHA256Algorithm();
                 JWT.IJsonSerializer serializer2 = new JWT.Serializers.JsonNetSerializer();

Edu.WebApi/Timers/TimerJobj.cs

@@ -143,7 +143,7 @@ namespace Edu.WebApi.Timers
         }
 
         /// <summary>
-        /// 处理值班数据
+        /// 定时处理考卷过期数据
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>