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

Edu.Model/Entity/Mall/RB_ActivitySurvey_Guest.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Mall
+{
+	/// <summary>
+	/// 活动参与人员配置表
+	/// </summary>
+	[Serializable]
+	[DB(ConnectionName = "MallConnection")]
+	public class RB_ActivitySurvey_Guest
+	{
+		/// <summary>
+		/// 主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 客户类型(1-小程序用户,2-学员用户)
+		/// </summary>
+		public int GuestType { get; set; }
+
+		/// <summary>
+		/// 对应客户类型Id
+		/// </summary>
+		public int GuestId { get; set; }
+
+		/// <summary>
+		/// 是否完成
+		/// </summary>
+		public int IsFinish { get; set; }
+
+		/// <summary>
+		/// 开始时间
+		/// </summary>
+		public DateTime StartTime { get; set; }
+
+		/// <summary>
+		/// 结束时间
+		/// </summary>
+		public DateTime EndTime { get; set; }
+
+		/// <summary>
+		/// 删除状态
+		/// </summary>
+		public int Status { get; set; }
+
+		/// <summary>
+		/// 集团
+		/// </summary>
+		public int MallBaseId { get; set; }
+
+		/// <summary>
+		/// 公司
+		/// </summary>
+		public int TenantId { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateDate { get; set; }
+
+		/// <summary>
+		/// 活动编号
+		/// </summary>
+		public int SurveyId { get; set; }
+	}
+}

Edu.Model/ViewModel/DataStatistics/RB_Teacher_Assessment_Extend.cs

@@ -29,5 +29,10 @@ namespace Edu.Model.ViewModel.DataStatistics
         /// 教师姓名
         /// </summary>
         public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 教师编号
+        /// </summary>
+        public int TeacherId { get; set; }
     }
 }

Edu.Model/ViewModel/Mall/RB_ActivitySurvey_Guest_Extend.cs

+using Edu.Model.Entity.Mall;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Mall
+{
+    /// <summary>
+    /// 活动参与人员配置表扩展实体
+    /// </summary>
+    public class RB_ActivitySurvey_Guest_Extend : RB_ActivitySurvey_Guest
+    {
+        /// <summary>
+        /// 学员名称
+        /// </summary>
+        public string GuestName { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
+    }
+}

Edu.Model/ViewModel/Sell/RB_Order_ReturnComission_ViewModel.cs

-using Edu.Model.Entity.Sell;
+using Edu.Common.Enum.Mall;
+using Edu.Model.Entity.Sell;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -83,5 +84,11 @@ namespace Edu.Model.ViewModel.Sell
         /// 员工id
         /// </summary>
         public int EnterID { get; set; }
+
+
+        /// <summary>
+        /// 订单类型
+        /// </summary>
+        public OrderTypeEnum OrderType { get; set; }
     }
 }

Edu.Model/ViewModel/User/RB_Teacher_Static_Extend.cs

@@ -24,6 +24,11 @@ namespace Edu.Model.ViewModel.User
         /// 部门编号
         /// </summary>
         public int DeptId { get; set; }
+
+        /// <summary>
+        /// 老师考核得分
+        /// </summary>
+        public decimal AssessmentScore { get; set; }
     }
 
     /// <summary>

Edu.Module.Course/ClassModule.cs

@@ -2541,8 +2541,11 @@ namespace Edu.Module.Course
                     }
                 }
             }
-            //通知教室端签到更新
-            await MessageCenterHub.GlobalContext.Clients.All.SendAsync("UpdateCheckin", "666");
+            if (MessageCenterHub.GlobalContext != null)
+            {
+                //通知教室端签到更新
+                await MessageCenterHub.GlobalContext.Clients.All.SendAsync("UpdateCheckin", "666");
+            }
             return flag;
         }
 

Edu.Module.Course/ScrollClassModule.cs

@@ -2933,7 +2933,10 @@ namespace Edu.Module.Course
                     }
                 }
 
-                await MessageCenterHub.GlobalContext.Clients.All.SendAsync("ChangePlan", "55555555 ");
+                if (MessageCenterHub.GlobalContext != null)
+                {
+                    await MessageCenterHub.GlobalContext.Clients.All.SendAsync("ChangePlan", "55555555 ");
+                }
             }
             return "";
         }
@@ -3003,7 +3006,10 @@ namespace Edu.Module.Course
                             class_CheckRepository.Update(keyValues, wheres);
                         }
                     }
-                    await MessageCenterHub.GlobalContext.Clients.All.SendAsync("ChangePlan", "55555555 ");
+                    if (MessageCenterHub.GlobalContext != null)
+                    {
+                        await MessageCenterHub.GlobalContext.Clients.All.SendAsync("ChangePlan", "55555555 ");
+                    }
                 }
             }
             return "";

Edu.Module.Goods/ActivitySurveyModule.cs

 using Edu.Model.Entity.Mall;
+using Edu.Model.ViewModel.Mall;
+using Edu.Model.ViewModel.User;
 using Edu.Repository.Mall;
+using Edu.Repository.User;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
+using VT.FW.DB;
 
 namespace Edu.Module.Goods
 {
@@ -16,15 +21,125 @@ namespace Edu.Module.Goods
         /// </summary>
         private readonly RB_ActivitySurveyRepository activitySurveyRepository = new RB_ActivitySurveyRepository();
 
+        /// <summary>
+        /// 活动参与人员仓储层对象
+        /// </summary>
+        private readonly RB_ActivitySurvey_GuestRepository activitySurvey_GuestRepository = new RB_ActivitySurvey_GuestRepository();
+
+        /// <summary>
+        /// 账号仓储层对象
+        /// </summary>
+        private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
+
         /// <summary>
         /// 获取问卷调查列表
         /// </summary>
         /// <param name="where"></param>
-        /// <param name="StuId"></param>
+        /// <param name="StuAccountId"></param>
+        /// <returns></returns>
+        public List<RB_ActivitySurvey> GetActivitySurveyListModule(RB_ActivitySurvey where, string StuAccountId)
+        {
+            return activitySurveyRepository.GetActivitySurveyListRepository(where, StuAccountId);
+        }
+
+        #region 活动参与人员
+
+        /// <summary>
+        /// 新增修改活动参与人员
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetActivitySurveyGuestModule(RB_ActivitySurvey_Guest_Extend model)
+        {
+            bool flag = false;
+            if (model.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_ActivitySurvey_Guest_Extend.GuestType),model.GuestType },
+                    {nameof(RB_ActivitySurvey_Guest_Extend.GuestId),model.GuestId },
+                    {nameof(RB_ActivitySurvey_Guest_Extend.StartTime),model.StartTime },
+                    {nameof(RB_ActivitySurvey_Guest_Extend.EndTime),model.EndTime },
+                };
+                flag = activitySurvey_GuestRepository.Update(fileds, new WhereHelper(nameof(RB_ActivitySurvey_Guest_Extend.Id), model.Id));
+            }
+            else
+            {
+                var newId = activitySurvey_GuestRepository.Insert(model);
+                model.Id = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据编号删除活动参与人员
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public bool RemoveActivitySurveyGuestModule(int Id)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_ActivitySurvey_Guest_Extend.Status),1 },
+            };
+            bool flag = activitySurvey_GuestRepository.Update(fileds, new WhereHelper(nameof(RB_ActivitySurvey_Guest_Extend.Id), Id));
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据编号获取参与人员信息
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public RB_ActivitySurvey_Guest_Extend GetActivitySurveyGuestModule(int Id)
+        {
+            var extModel = activitySurvey_GuestRepository.GetEntity<RB_ActivitySurvey_Guest_Extend>(Id);
+            return extModel;
+        }
+
+        /// <summary>
+        /// 获取活动参与人员分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_ActivitySurvey_Guest_Extend> GetActivitySurveyGuestPageModule(int pageIndex, int pageSize, out long rowsCount, RB_ActivitySurvey_Guest_Extend query)
+        {
+            var list = activitySurvey_GuestRepository.GetActivitySurveyGuestPageRepository(pageIndex, pageSize, out rowsCount, query);
+            if (list != null && list.Count > 0)
+            {
+                string Ids = string.Join(",", list.Where(qitem => qitem.GuestType == 2).Select(qitem => qitem.GuestId));
+                List<RB_Account_ViewModel> stuList = new List<RB_Account_ViewModel>();
+                if (!string.IsNullOrEmpty(Ids))
+                {
+                    stuList=accountRepository.GetStudentExt(new RB_Account_ViewModel() {QIds=Ids });
+                }
+                foreach (var item in list)
+                {
+                    item.GuestName = "";
+                    if (item.GuestType == 2)
+                    {
+                        item.GuestName = stuList?.FirstOrDefault(qitem => qitem.Id == item.GuestId)?.AccountName ?? "";
+                    }
+                }
+            }
+            return list;
+        }
+
+
+        /// <summary>
+        /// 获取活动参与人员列表
+        /// </summary>
+        /// <param name="query"></param>
         /// <returns></returns>
-        public List<RB_ActivitySurvey> GetActivitySurveyListModule(RB_ActivitySurvey where, string StuId)
+        public List<RB_ActivitySurvey_Guest_Extend> GetActivitySurveyGuestListModule(RB_ActivitySurvey_Guest_Extend query)
         {
-            return activitySurveyRepository.GetActivitySurveyListRepository(where, StuId);
+            var list = activitySurvey_GuestRepository.GetActivitySurveyGuestListRepository(query);
+            return list;
         }
+        #endregion
     }
 }

Edu.Module.User/AccountModule.cs

@@ -102,7 +102,7 @@ namespace Edu.Module.User
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
                     {nameof(RB_Account_ViewModel.OpenId),model.OpenId.Trim() },
-                      {nameof(RB_Account_ViewModel.UnionId),model.UnionId.Trim() }
+                    {nameof(RB_Account_ViewModel.UnionId),model.UnionId.Trim() }
                 };
                 flag = accountRepository.Update(fileds, new WhereHelper(nameof(RB_Account_ViewModel.Id), model.Id));
             }

Edu.Module.User/TeacherAssessmentModule.cs

@@ -147,7 +147,7 @@ namespace Edu.Module.User
                     else
                     {
                         var newId = assessment_SubtypeRepository.Insert(subItem);
-                        model.Id = newId;
+                        subItem.Id = newId;
                         flag = newId > 0;
                     }
                 }
@@ -269,12 +269,13 @@ namespace Edu.Module.User
         /// <summary>
         /// 获取老师考核数据
         /// </summary>
+        /// <param name="Id"></param>
         /// <param name="TeacherAccountId"></param>
         /// <param name="YearStr"></param>
         /// <param name="MonthStr"></param>
-        /// <param name="UserInfo"></param>
+        /// <param name="userInfo"></param>
         /// <returns></returns>
-        public object GetTeacherAssessmentModule(int TeacherAccountId, int YearStr, int MonthStr, UserInfo userInfo)
+        public object GetTeacherAssessmentModule(int Id, int TeacherAccountId, int YearStr, int MonthStr, UserInfo userInfo)
         {
             object result = new object();
             CheckTypeEnum CheckType = 0;
@@ -293,12 +294,24 @@ namespace Edu.Module.User
                     CheckType = CheckTypeEnum.JiaoWuManager;
                 }
             }
-            var extModel = teacher_AssessmentRepository.GetTeacherAssessmentEntityRepository(new RB_Teacher_Assessment_Extend()
+            var extModel = new RB_Teacher_Assessment_Extend();
+            if (Id > 0)
             {
-                YearStr = YearStr,
-                MonthStr = MonthStr,
-                TeacherAccountId = TeacherAccountId
-            });
+                extModel = teacher_AssessmentRepository.GetTeacherAssessmentEntityRepository(new RB_Teacher_Assessment_Extend()
+                {
+                    Id = Id
+                });
+            }
+            else
+            {
+                extModel = teacher_AssessmentRepository.GetTeacherAssessmentEntityRepository(new RB_Teacher_Assessment_Extend()
+                {
+                    YearStr = YearStr,
+                    MonthStr = MonthStr,
+                    TeacherAccountId = TeacherAccountId
+                });
+            }
+          
             var detailsList = teacher_Assessment_DetailsRepository.GetTeacherAssessmentDetailsListRepository(new RB_Teacher_Assessment_Details_Extend()
             {
                 TeacherAssessmentId = (extModel?.Id ?? 0),

Edu.Module.User/TeacherStaticModule.cs

 using Edu.Model.CacheModel;
+using Edu.Model.ViewModel.DataStatistics;
 using Edu.Model.ViewModel.User;
 using Edu.Model.ViewModel.WeChat;
+using Edu.Repository.DataStatistics;
 using Edu.Repository.User;
 using System;
 using System.Collections.Generic;
@@ -24,6 +26,11 @@ namespace Edu.Module.User
         /// </summary>
         private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
 
+        /// <summary>
+        /// 教师考核仓储层对象
+        /// </summary>
+        private readonly RB_Teacher_AssessmentRepository teacher_AssessmentRepository = new RB_Teacher_AssessmentRepository();
+
         /// <summary>
         /// 教师行为数据数据每日统计
         /// </summary>
@@ -515,17 +522,26 @@ namespace Edu.Module.User
             qDate += "-01";
             //跟踪列表
             var followList = teacher_StaticRepository.GetTeacherFollowByProcRepository(qDate);
+            //老师考核数据
+            var teacherAssessmentList = teacher_AssessmentRepository.GetTeacherAssessmentListRepository(new RB_Teacher_Assessment_Extend()
+            {
+                YearStr = query.YearStr,
+                MonthStr = query.MonthStr,
+                Group_Id = query.Group_Id,
+            });
             var list = teacher_StaticRepository.GetTeacherStaticMonthExtListRepository(query);
             if (list != null && list.Count > 0)
             {
                 foreach (var item in list)
                 {
                     var tempFollow = followList.Where(qitem => qitem.TeacherId == item.TeacherId)?.FirstOrDefault();
+                    var tempAssessment = teacherAssessmentList?.Where(qitem => qitem.TeacherId == item.TeacherId)?.FirstOrDefault();
+                    item.AssessmentScore = tempAssessment?.TotalScore ?? 0;
                     item.TotalScore = (item.StudentCount + item.AttendClassHourScore + item.OnLineInteractiveScore + item.RenewScore
                              + item.UpgradeScore + item.TransScore + item.TrialSpeakScore - item.TruancyScore - item.WithdrawsScore - item.ComplaintScore
                              - item.TeacherBeLateScore + item.MiniAppPractiseScore + item.MiniAppTimeScore
                              + item.N5ClassHoursScore * 1 + item.N4ClassHoursScore * 2 + item.N3ClassHoursScore * 3 + item.N2ClassHoursScore * 4 + item.N1ClassHoursScore * 5
-                             + item.ActivityNum +(tempFollow?.FinishTimes ?? 0)
+                             + item.ActivityNum + (tempFollow?.FinishTimes ?? 0) + item.AssessmentScore
                              );
 
                 }
@@ -533,6 +549,7 @@ namespace Edu.Module.User
                 foreach (var item in list)
                 {
                     var tempFollow = followList.Where(qitem => qitem.TeacherId == item.TeacherId)?.FirstOrDefault();
+                    var tempAssessment = teacherAssessmentList?.Where(qitem => qitem.TeacherId == item.TeacherId)?.FirstOrDefault();
                     int teacherCount = 1;
                     var teacherModel = teacherList.FirstOrDefault(qitem => qitem.AccountId == item.TeacherId);
                     string DateStr = "";
@@ -595,6 +612,7 @@ namespace Edu.Module.User
                         item.ActivityNum,
                         FinishTimes= tempFollow?.FinishTimes??0,
                         FollowCount = tempFollow?.FollowCount ?? 0,
+                        item.AssessmentScore,
                     });
                 }
                 var tempList = list?.Where(qitem => !string.IsNullOrEmpty(Common.ConvertHelper.FormatDate(qitem.Date)))?.ToList();
@@ -646,6 +664,7 @@ namespace Edu.Module.User
                     ActivityNum = tempList?.Sum(qitem => qitem.ActivityNum),
                     FinishTimes = followList?.Sum(qitem => qitem.FinishTimes),
                     FollowCount = followList?.Sum(qitem => qitem.FollowCount),
+                    AssessmentScore = tempList?.Sum(qitem => qitem.AssessmentScore),
                 });
             }
             return dataList;

Edu.Repository/DataStatistics/RB_Teacher_AssessmentRepository.cs

@@ -60,7 +60,7 @@ WHERE 1=1
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.*,IFNULL(C.TeacherName,'') AS TeacherName
+SELECT A.*,IFNULL(C.TeacherName,'') AS TeacherName,C.TId AS TeacherId
 FROM RB_Teacher_Assessment AS A LEFT JOIN rb_account AS B ON A.TeacherAccountId=B.Id
      LEFT JOIN rb_teacher AS C ON B.AccountId=C.TId
 WHERE 1=1
@@ -118,8 +118,15 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.MonthStr), query.MonthStr);
                 }
+                if (query.Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.Id), query.Id);
+                }
+                if (query.TeacherAccountId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.TeacherAccountId), query.TeacherAccountId);
+                }
             }
-            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.TeacherAccountId), query.TeacherAccountId);
             return Get<RB_Teacher_Assessment_Extend>(builder.ToString()).FirstOrDefault();
         }
     }

Edu.Repository/Mall/RB_ActivitySurveyRepository.cs

@@ -20,19 +20,21 @@ namespace Edu.Repository.Mall
         /// 获取问卷调查列表
         /// </summary>
         /// <param name="where"></param>
-        /// <param name="StuId"></param>
+        /// <param name="StuAccountId"></param>
         /// <returns></returns>
-        public List<RB_ActivitySurvey> GetActivitySurveyListRepository(RB_ActivitySurvey where,string StuId)
+        public List<RB_ActivitySurvey> GetActivitySurveyListRepository(RB_ActivitySurvey where,string StuAccountId)
         {
             StringBuilder sb = new StringBuilder();
             sb.AppendFormat($@"
 SELECT A.* 
 FROM RB_ActivitySurvey AS A 
 WHERE A.State=0 ");
-            sb.AppendFormat(" AND A.StartDate<'{0}' AND A.EndDate>'{0}' ", Common.ConvertHelper.FormatDate(DateTime.Now));
-            if (!string.IsNullOrEmpty(StuId))
+            string dateStr = Common.ConvertHelper.FormatDate(DateTime.Now);
+            sb.AppendFormat(" AND A.StartDate<'{0}' AND A.EndDate>'{0}' ", dateStr);
+            if (!string.IsNullOrEmpty(StuAccountId))
             {
-                sb.AppendFormat(" AND NOT EXISTS(SELECT 1 FROM rb_guestsurvey WHERE UserType=2 AND ActivitySurveyId=A.ID AND UserId={0}) ", StuId);
+                //sb.AppendFormat(" AND NOT EXISTS(SELECT 1 FROM rb_guestsurvey WHERE UserType=2 AND ActivitySurveyId=A.ID AND UserId={0}) ", StuAccountId);
+                sb.AppendFormat(" AND EXISTS(SELECT 1 FROM RB_ActivitySurvey_Guest WHERE GuestType=2 AND IsFinish=0 AND SurveyId=A.ID AND GuestId={0} AND StartTime<'{1}' AND EndTime>'{1}' )", StuAccountId, dateStr);
             }
             if (where != null)
             {

Edu.Repository/Mall/RB_ActivitySurvey_GuestRepository.cs

+using Edu.Model.Entity.Mall;
+using Edu.Model.ViewModel.Mall;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Edu.Repository.Mall
+{
+    /// <summary>
+    /// 活动参与人员配置仓储层
+    /// </summary>
+    public class RB_ActivitySurvey_GuestRepository : BaseRepository<RB_ActivitySurvey_Guest>
+    {
+        /// <summary>
+        /// 获取活动参与人员分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_ActivitySurvey_Guest_Extend> GetActivitySurveyGuestPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_ActivitySurvey_Guest_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* 
+FROM RB_ActivitySurvey_Guest AS A
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.Status), 0);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.SurveyId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.SurveyId), query.SurveyId);
+                }
+            }
+            return GetPage<RB_ActivitySurvey_Guest_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 获取活动参与人员列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_ActivitySurvey_Guest_Extend> GetActivitySurveyGuestListRepository(RB_ActivitySurvey_Guest_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* 
+FROM RB_ActivitySurvey_Guest AS A
+WHERE 1=1
+");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.Status), 0);
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.TenantId), query.TenantId);
+                }
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.MallBaseId), query.MallBaseId);
+                }
+                if (query.SurveyId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_ActivitySurvey_Guest_Extend.SurveyId), query.SurveyId);
+                }
+            }
+            return Get<RB_ActivitySurvey_Guest_Extend>(builder.ToString()).ToList();
+        }
+
+    }
+}

Edu.Repository/Sell/RB_Order_ReturnComissionRepository.cs

@@ -148,9 +148,8 @@ where a.`Status`=0 and c.CreateTime<date_add(curdate(),interval -day(curdate())+
             {
                 where += $@" and cus.{nameof(RB_Order_ReturnComission_ViewModel.CategoryId)}={demodel.CategoryId} ";
             }
-
             string sql = $@" 
-select r.*,b.BatchName,o.ClassId,c.ClassName,c.ClassNo,s.StuName 
+select r.*,b.BatchName,o.ClassId,c.ClassName,c.ClassNo,s.StuName,o.OrderType 
 from RB_Order_ReturnComission r left join rb_returnmoney_batch b on r.BatchId = b.Id
      left join rb_order o on r.OrderId = o.OrderId
      left join rb_class c on o.ClassId = c.ClassId

Edu.Repository/Sell/RB_ReturnMoney_BatchRepository.cs

@@ -24,25 +24,22 @@ namespace Edu.Repository.Sell
         /// <returns></returns>
         public List<RB_ReturnMoney_Batch_ViewModel> GetPageList(int pageIndex, int pageSize, out long count, int type, string month, int groupId)
         {
-            string sql = $@"";
-            sql += $@"  ";
-            sql += " ";
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT IFNULL(SUM(b.CommissionMoeny),0) as TotalEmployee,IFNULL(SUM(c.CommissionMoeny),0) as TotalCustomer,a.FinanceIds
-      ,IFNULL(SUM(d.CommissionMoeny),0) as TotalInternal,IFNULL(SUM(e.CommissionMoeny),0) as TotalTrans
+SELECT IFNULL(b.CommissionMoeny,0) as TotalEmployee,IFNULL(c.CommissionMoeny,0) as TotalCustomer,a.FinanceIds
+      ,IFNULL(d.CommissionMoeny,0) as TotalInternal,IFNULL(e.CommissionMoeny,0) as TotalTrans
       ,a.Id,a.BatchName,TotalMoney,a.CreateBy,a.CreateDate,DATE_FORMAT(a.CreateDate,'%Y-%m-%d %H:%i:%S') as CreateDateStr
 FROM RB_ReturnMoney_Batch a  LEFT JOIN 
-   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=1 and `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as b
+   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  WHERE OrderSourceType=1 AND `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as b
     on a.Id=b.BatchId
     LEFT JOIN 
-   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=2 and `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as c
+   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  WHERE OrderSourceType=2 AND `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as c
     on a.Id=c.BatchId
    LEFT JOIN 
-   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=3 and `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as d
+   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  WHERE OrderSourceType=3 AND `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as d
     on a.Id=d.BatchId
    LEFT JOIN 
-   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  where OrderSourceType=4 and `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as e
+   (SELECT SUM(CommissionMoeny) as CommissionMoeny,BatchId FROM rb_order_returncomission  WHERE OrderSourceType=4 AND `Status` in(1,2) GROUP BY  OrderSourceType,BatchId) as e
     on a.Id=e.BatchId 
 WHERE 1=1
 ");

Edu.WebApi/Controllers/Applet/AppletIndexController.cs

@@ -246,7 +246,7 @@ namespace Edu.WebApi.Controllers.Applet
                                 }
                             }
                         }
-                        catch(Exception ex)
+                        catch (Exception ex)
                         {
                             Common.Plugin.LogHelper.Write(ex, "GetIndexInfo_V2_OpenBankLevel");
                         }
@@ -442,6 +442,7 @@ namespace Edu.WebApi.Controllers.Applet
             };
             return ApiResult.Success("", result);
         }
+
         #endregion
 
         #region 我的学习

Edu.WebApi/Controllers/Course/ClassController.cs

 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 using Edu.Cache.User;
@@ -1204,17 +1206,26 @@ namespace Edu.WebApi.Controllers.Course
                     });
                 }
             }
+            int groupId = 100000;
+            int Uid = 1;
+            if (base.UserInfo != null)
+            {
+                groupId = base.UserInfo.Group_Id;
+                Uid = base.UserInfo.Id;
+            }
+            
             //判断当天是否有已签到数据
             var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel
             {
-                Group_Id = base.UserInfo.Group_Id,
+                Group_Id = groupId,
                 ClassId = list.FirstOrDefault().ClassId,
                 StartDate = list.FirstOrDefault().ClassDate.ToString("yyyy-MM-dd HH:mm:ss"),
                 EndDate = list.FirstOrDefault().ClassDate.ToString("yyyy-MM-dd HH:mm:ss"),
                 ClassTimeId = list.FirstOrDefault().ClassTimeId,
             });
             #region 验证是否存在学员编号
-            if (list.Count == 1) {
+            if (list.Count == 1)
+            {
                 if (list[0].OrderGuestId == 0)
                 {
                     var guestId = classModule.GetStudentOrderGuestIdByClassTimeIDModule(list[0].StuId, list[0].ClassTimeId);
@@ -1245,7 +1256,7 @@ namespace Edu.WebApi.Controllers.Course
             #region 验证是否已轧账
             string MonthStr = list.FirstOrDefault().ClassDate.ToString("yyyy-MM");
             int schoolId = list.FirstOrDefault().School_Id;
-            string ValidateMsg = classModule.ValidateClassCheckFinance(MonthStr, schoolId, base.UserInfo.Group_Id);
+            string ValidateMsg = classModule.ValidateClassCheckFinance(MonthStr, schoolId, groupId);
             if (ValidateMsg != "")
             {
                 return ApiResult.Failed(ValidateMsg);
@@ -1253,12 +1264,12 @@ namespace Edu.WebApi.Controllers.Course
             #endregion
 
             //获取班级的学员信息
-            var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId, QEffectStatus = 1 });
+            var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = groupId, ClassId = list.FirstOrDefault().ClassId, QEffectStatus = 1 });
 
             //判断今天有课没有
             var planList = classModule.GetClassPlanEntityModule(new RB_Class_Plan_ViewModel
             {
-                Group_Id = base.UserInfo.Group_Id,
+                Group_Id = groupId,
                 ClassId = list.FirstOrDefault().ClassId,
                 QClassDateStr = Common.ConvertHelper.FormatDate(list.FirstOrDefault().ClassDate),
             });
@@ -1277,7 +1288,7 @@ namespace Edu.WebApi.Controllers.Course
                     item.ClassCheckId = signModel.ClassCheckId;
                     item.Group_Id = signModel.Group_Id;
                     item.CreateTime = signModel.CreateTime;
-                    item.CreateBy = base.UserInfo.Id;
+                    item.CreateBy = Uid;
                     item.Status = 0;
 
                     #region 验证缺席 补课是否已处理
@@ -1297,9 +1308,9 @@ namespace Edu.WebApi.Controllers.Course
                 }
                 else
                 {
-                    item.Group_Id = base.UserInfo.Group_Id;
+                    item.Group_Id = groupId;
                     item.CreateTime = System.DateTime.Now;
-                    item.CreateBy = base.UserInfo.Id;
+                    item.CreateBy = Uid;
                     item.Status = 0;
                 }
             }
@@ -1311,6 +1322,36 @@ namespace Edu.WebApi.Controllers.Course
             return result ? ApiResult.Success(message:"check_success") : ApiResult.Failed("签到失败");
         }
 
+        ///// <summary>
+        ///// 视频转码回调
+        ///// </summary>
+        ///// <returns></returns>
+        //[HttpPost]
+        //[AllowAnonymous]
+        //public ApiResult VodCallBack()
+        //{
+        //    var headers = Request.HttpContext.Request.Headers;
+        //    var timestamp = headers["X-VOD-TIMESTAMP"].ToString();
+        //    var signature = headers["X-VOD-SIGNATURE"].ToString();
+        //    var callUrl= "https://eduapi.oytour.com/api/class/VodCallBack";
+        //    var privateKey = "AliyunVodViittoCallBack2022";
+        //    var md5Str=string.Join("", MD5.Create().ComputeHash(Encoding.UTF8.GetBytes($"{callUrl}|{timestamp}|{privateKey}")).Select(x => x.ToString("x2")));
+
+        //    if (md5Str.Equals(signature))
+        //    {
+        //        LogHelper.Write($"收到回调，比对结果为TRUE,{callUrl}|{timestamp}|{privateKey}|{md5Str}|{signature}");
+
+        //        p
+
+        //    }
+        //    else 
+        //    {
+        //        LogHelper.Write($"收到回调，比对结果为false,{callUrl}|{timestamp}|{privateKey}|{md5Str}|{signature}");
+        //    }
+
+        //    return ApiResult.Success();
+        //}
+
         /// <summary>
         /// 获取班级学生树形列表
         /// </summary>

Edu.WebApi/Controllers/Customer/CustomerCommissionController.cs

@@ -63,7 +63,14 @@ namespace Edu.WebApi.Controllers.Course
         {
             var userInfo = base.UserInfo;
             var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
-            var dmodel = JsonHelper.DeserializeObject<RB_ReturnMoney_Batch_ViewModel>(RequestParm.Msg.ToString());
+            var dmodel = new RB_ReturnMoney_Batch_ViewModel()
+            {
+                Month = base.ParmJObj.GetStringValue("Month"),
+                CommissionType=base.ParmJObj.GetInt("CommissionType"),
+            };
+            string schoolId = base.ParmJObj.GetStringValue("SchoolId");
+            Int32.TryParse(schoolId, out int newSchoolId);
+           
             dmodel.GroupId = userInfo.Group_Id;
 
             var list = customerCommissionModule.GetCommissionPeriodsPageList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
@@ -253,7 +260,8 @@ namespace Edu.WebApi.Controllers.Course
                     x.BatchName,
                     x.StuId,
                     x.StuName,
-                    x.CommissionType
+                    x.CommissionType,
+                    x.OrderType,
                 })
             };
             return ApiResult.Success("", pageModel);

Edu.WebApi/Controllers/DataService/TeacherAssessmentController.cs

@@ -215,7 +215,8 @@ namespace Edu.WebApi.Controllers.DataService
             int TeacherAccountId = base.ParmJObj.GetInt("TeacherAccountId");
             int YearStr = base.ParmJObj.GetInt("YearStr");
             int MonthStr = base.ParmJObj.GetInt("MonthStr");
-            var obj = teacherAssessmentModule.GetTeacherAssessmentModule(TeacherAccountId, YearStr, MonthStr, base.UserInfo);
+            int Id = base.ParmJObj.GetInt("Id");
+            var obj = teacherAssessmentModule.GetTeacherAssessmentModule(Id,TeacherAccountId, YearStr, MonthStr, base.UserInfo);
             return ApiResult.Success(data: obj);
         }
 

Edu.WebApi/Controllers/Goods/SurveyController.cs

+using Edu.Common.API;
+using Edu.Common.Plugin;
+using Edu.Model.ViewModel.Mall;
+using Edu.Module.Goods;
+using Edu.WebApi.Filter;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Edu.WebApi.Controllers.Goods
+{
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class SurveyController : BaseController
+    {
+        /// <summary>
+        /// 问卷调查处理类对象
+        /// </summary>
+        private readonly ActivitySurveyModule activitySurveyModule = new ActivitySurveyModule();
+
+        /// <summary>
+        /// 获取文件调查参与学员分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetActivitySurveyGuestPage()
+        {
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var query = new RB_ActivitySurvey_Guest_Extend()
+            {
+                SurveyId=base.ParmJObj.GetInt("SurveyId")
+            };
+            query.TenantId = Convert.ToInt32(base.UserInfo.JHTenantId);
+            query.MallBaseId = Convert.ToInt32(base.UserInfo.JHMallBaseId);
+            var list = activitySurveyModule.GetActivitySurveyGuestPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            List<object> result = new List<object>();
+            foreach (var item in list)
+            {
+                
+                result.Add(new
+                {
+                    item.Id,
+                    item.GuestId,
+                    item.GuestName,
+                    item.GuestType,
+                    item.CreateByName,
+                    CreateDate = Common.ConvertHelper.FormatTime(item.CreateDate),
+                    StartTime =Common.ConvertHelper.FormatTime(item.StartTime),
+                    EndTime = Common.ConvertHelper.FormatTime(item.EndTime),
+                });
+            }
+            pageModel.Count = rowsCount;
+            pageModel.PageData = result;
+            return ApiResult.Success(data: pageModel);
+        }
+
+        /// <summary>
+        /// 添加修改意见调查表学生
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetActivitySurveyGuest()
+        {
+            var extModel = new RB_ActivitySurvey_Guest_Extend()
+            {
+                Id = base.ParmJObj.GetInt("Id"),
+                GuestType = base.ParmJObj.GetInt("GuestType"),
+                GuestId = base.ParmJObj.GetInt("GuestId"),
+                StartTime = base.ParmJObj.GetDateTime("StartTime"),
+                EndTime = base.ParmJObj.GetDateTime("EndTime"),
+                SurveyId = base.ParmJObj.GetInt("SurveyId"),
+            };
+            extModel.Status = 0;
+            extModel.CreateBy = base.UserInfo.Id;
+            extModel.CreateDate = DateTime.Now;
+            extModel.TenantId = Convert.ToInt32(base.UserInfo.JHTenantId);
+            extModel.MallBaseId = Convert.ToInt32(base.UserInfo.JHMallBaseId);
+            bool flag = activitySurveyModule.SetActivitySurveyGuestModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+
+        /// <summary>
+        /// 根据编号获取意见调查表学员详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetActivitySurveyGuestModule()
+        {
+            var Id = base.ParmJObj.GetInt("Id");
+            var extModel = activitySurveyModule.GetActivitySurveyGuestModule(Id);
+            var obj = new
+            {
+                Id = extModel?.Id ?? 0,
+                GuestId = extModel?.GuestId ?? 0,
+                GuestType = extModel?.GuestType ?? 0,
+                StartTime = Common.ConvertHelper.FormatTime(extModel.StartTime),
+                EndTime = Common.ConvertHelper.FormatTime(extModel.EndTime),
+            };
+            return ApiResult.Success(data: obj);
+        }
+
+
+        /// <summary>
+        /// 根据编号删除意见调查表学员详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult RemoveActivitySurveyGuest()
+        {
+            var Id = base.ParmJObj.GetInt("Id");
+            bool flag = activitySurveyModule.RemoveActivitySurveyGuestModule(Id);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+    }
+}

Edu.WebApi/Controllers/User/TeacherStaticController.cs

@@ -209,6 +209,7 @@ namespace Edu.WebApi.Controllers.User
                         new ExcelColumn("学生小程序刷题次数"){ CellWidth=15},
                         new ExcelColumn("学生小程序刷题时间"){ CellWidth=15},
                         new ExcelColumn("活动次数"){ CellWidth=15},
+                        new ExcelColumn("考核得分"){ CellWidth=15},
                         new ExcelColumn("总分数"){ CellWidth=15},
                         new ExcelColumn("所有老师平均分数"){ CellWidth=15},
                         new ExcelColumn("分数差距"){ CellWidth=15},
@@ -242,6 +243,7 @@ namespace Edu.WebApi.Controllers.User
                     columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppPractiseScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppTimeScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("ActivityNum")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("AssessmentScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("TotalScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("AvgScore")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("ScoreGap")));