页面修改

Edu.Model/CacheModel/UserInfo.cs

@@ -167,6 +167,11 @@ namespace Edu.Model.CacheModel
         /// 客服Token
         /// </summary>
         public TenCccTokenItem TenCccToken { get; set; }
+
+        /// <summary>
+        /// 是否是课程顾问(1-是)
+        /// </summary>
+        public int IsCourseConsultant { get; set; }
     }
 
     /// <summary>

Edu.Model/Entity/Exam/RB_StuWords_Exam.cs

@@ -49,7 +49,7 @@ namespace Edu.Model.Entity.Exam
 		/// <summary>
 		/// 学校Id
 		/// </summary>
-		public int? School_Id { get; set; }
+		public int School_Id { get; set; }
 
 		/// <summary>
 		/// 集团编号

Edu.Model/ViewModel/User/RB_Account_ViewModel.cs

-using System;
+using Edu.Common.Enum.User;
+using System;
 
 namespace Edu.Model.ViewModel.User
 {
@@ -92,5 +93,10 @@ namespace Edu.Model.ViewModel.User
         /// 是否是电话客服
         /// </summary>
         public int IsTenCccUser { get; set; }
+
+        /// <summary>
+        /// 用户角色
+        /// </summary>
+        public UserRoleEnum UserRole { get; set; }
     }
 }
\ No newline at end of file

Edu.Repository/User/RB_AccountRepository.cs

@@ -150,16 +150,19 @@ FROM
 (
 		SELECT A.Id,A.Account,A.WorkUserId,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`,B.LeaveStatus
               ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.MName,'') AS AccountName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id,IFNULL(B.Email,'') AS Email,B.IsTenCccUser
+              ,B.UserRole
 		FROM rb_account AS A INNER JOIN rb_manager AS B ON A.AccountId=B.MId AND A.AccountType=1
 		WHERE 1=1  {0}
 		UNION ALL
 		SELECT A.Id,A.Account,A.WorkUserId,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`,B.LeaveStatus
               ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.TeacherName,'') AS AccountName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id,IFNULL(B.Email,'') AS Email,B.IsTenCccUser
+              ,B.UserRole
 		FROM rb_account AS A INNER JOIN rb_teacher AS B ON A.AccountId=B.TId AND A.AccountType=2
 		WHERE 1=1  {0}
 		UNION ALL
 		SELECT A.Id,A.Account,A.WorkUserId,A.`Password`,A.AccountType,A.AccountId,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,B.School_Id,A.`Status`,B.LeaveStatus
               ,A.AnnualLeaveDay, A.DirectSupervisor,A.OpenId,A.ActivationStatus,IFNULL(B.AssistName,'') AS AccountName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id,IFNULL(B.Email,'') AS Email,0 AS IsTenCccUser
+              ,0 AS UserRole
 		FROM rb_account AS A INNER JOIN rb_assist AS B ON A.AccountId=B.AId AND A.AccountType=3
 		WHERE 1=1  {0}
 ) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId

Edu.WebApi/Controllers/Applet/AppletWordsController.cs

@@ -5,6 +5,7 @@ using Edu.Module.Exam;
 using Edu.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -112,8 +113,45 @@ namespace Edu.WebApi.Controllers.Applet
         {
             var model = new RB_StuWords_Exam_Extend()
             {
-
+                Id = base.ParmJObj.GetInt("Id"),
+                ClassId = base.ParmJObj.GetInt("ClassId"),
+                CourseId=base.ParmJObj.GetInt("CourseId"),
+                ChapterId=base.ParmJObj.GetInt("ChapterId"),
+                ExamStartTime = base.ParmJObj.GetDateTime("ExamStartTime"),
             };
+            model.Stu_Account_Id = base.AppletUserInfo.Id;
+            model.CreateBy = base.AppletUserInfo.Id;
+            model.CreateTime = DateTime.Now;
+            model.School_Id = base.AppletUserInfo.School_Id;
+            model.Group_Id = base.AppletUserInfo.Group_Id;
+            model.Status = Common.Enum.DateStateEnum.Normal;
+            model.Score = 0;
+            model.ExamEndTime = DateTime.Now;
+            model.ExamDetailList = new List<RB_StuWords_ExamDetail_Extend>();
+            string details = base.ParmJObj.GetStringValue("Details");
+            if (!string.IsNullOrEmpty(details))
+            {
+                JArray jArray = JArray.Parse(details);
+                if (jArray != null && jArray.Count > 0)
+                {
+                    foreach (var obj in jArray)
+                    {
+                        JObject jobj = JObject.Parse(obj.ToString());
+                        model.ExamDetailList.Add(new RB_StuWords_ExamDetail_Extend()
+                        {
+                            DetailId = 0,
+                            ExamId = 0,
+                            WordId = jobj.GetInt("WordId"),
+                            Title = jobj.GetStringValue("Title"),
+                            QuestionContent = jobj.GetStringValue("QuestionContent"),
+                            QuestionTypeId = jobj.GetInt("QuestionTypeId"),
+                            QuestionTypeKey=jobj.GetStringValue("QuestionTypeKey"),
+                            Score=jobj.GetDecimal("Score"),
+                        });
+                    }
+                }
+            }
+
             var flag = courseExamModule.SubmitStuWordsExamModule(model);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }

Edu.WebApi/Controllers/User/LoginController.cs

@@ -226,6 +226,7 @@ namespace Edu.WebApi.Controllers.User
                     PostName = model.PostName,
                     Email = model.Email,
                     IsTenCccUser = model.IsTenCccUser,
+                    IsCourseConsultant = (model != null && model.UserRole == UserRoleEnum.CourseConsultant) ? 1 : 0,
                     ActionMenuList = actionList?.Select(qitem => new { qitem.FunctionCode, qitem.FunctionName, qitem.MenuName, qitem.MenuUrl }),
                     UploadConfig = new
                     {
@@ -239,7 +240,7 @@ namespace Edu.WebApi.Controllers.User
                     },
                     StudyAbroadObj = publicModule.GetStudyAbroadListModule()
                 };
-                if (model.IsTenCccUser == 1) 
+                if (model.IsTenCccUser == 1)
                 {
                     var tObj = new TenCloudCCCHelper().GetTenCccUserToken(model.Email).Result;
                     obj.TenCccToken = new TenCccTokenItem()