提交老师问卷调查信息

Edu.Common/Config.cs

@@ -109,6 +109,9 @@ namespace Edu.Common
             }
         }
 
+
+
+      
         /// <summary>
         /// JWT加密秘钥
         /// </summary>
@@ -133,6 +136,18 @@ namespace Edu.Common
         }
 
 
+        /// <summary>
+        /// 教育前端url地址
+        /// </summary>
+        public static string EducationUrl
+        {
+            get
+            {
+                return ReadConfigKey("EducationUrl");
+            }
+        }
+        
+
         /// <summary>
         /// 阿里云oss域名
         /// </summary>

Edu.Common/Edu.Common.csproj

@@ -16,6 +16,7 @@
     <PackageReference Include="RabbitMQ.Client" Version="5.1.2" />
     <PackageReference Include="Spire.Doc" Version="8.12.14" />
     <PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
+    <PackageReference Include="ThoughtWorks.QRCode" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup>

Edu.Common/Enum/Survey/SurveyTypeEnum.cs

+using Edu.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Common.Enum.Survey
+{
+    /// <summary>
+    /// 意见调查类型枚举
+    /// </summary>
+    public enum SurveyTypeEnum
+    {
+        /// <summary>
+        /// 打分
+        /// </summary>
+        [EnumField("打分")]
+        Score = 1,
+        /// <summary>
+        /// 单选
+        /// </summary>
+        [EnumField("单选")]
+        TheRadio = 2,
+        /// <summary>
+        /// 多选
+        /// </summary>
+        [EnumField("多选")]
+        MultiSelect = 3,
+
+
+        /// <summary>
+        /// 文本
+        /// </summary>
+        [EnumField("文本")]
+        TheText = 4,
+    }
+}

Edu.Model/Entity/Survey/Rb_Education_StudentSurvey.cs

+using Edu.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Survey
+{
+    /// <summary>
+    /// 学生意见信息表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Education_StudentSurvey
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int ID { get; set; }
+
+
+        /// <summary>
+        /// 学生id
+        /// </summary>
+        public int StudentId { get; set; }
+
+
+        /// <summary>
+        /// 老师id
+        /// </summary>
+        public int TeacherId { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateDate { get; set; }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        public DateStateEnum State { get; set; }
+    }
+}

Edu.Model/Entity/Survey/Rb_Education_StudentSurveyDetails.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Survey
+{
+    /// <summary>
+    /// 学生意见信息选项表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Education_StudentSurveyDetails
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int ID { get; set; }
+
+
+        /// <summary>
+        /// 学生调查id
+        /// </summary>
+        public int StudentSurveyId { get; set; }
+
+
+        /// <summary>
+        /// 意见id
+        /// </summary>
+        public int? SurveyId { get; set; }
+
+
+        /// <summary>
+        /// 意见选项ids
+        /// </summary>
+        public string SurveyOptionIds { get; set; }
+
+        /// <summary>
+        /// 文本内容
+        /// </summary>
+        public string TextContent { get; set; }
+
+        /// <summary>
+        /// 分数
+        /// </summary>
+        public int ScoreNum { get; set; }
+
+
+    }
+}

Edu.Model/Entity/Survey/Rb_Education_Survey.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.Survey;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Survey
+{
+    /// <summary>
+    /// 学生意见调查信息表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Education_Survey
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int ID { get; set; }
+        /// <summary>
+        ///意见调查类型
+        /// </summary>
+
+        public SurveyTypeEnum? SurveyType { get; set; }
+
+        /// <summary>
+        /// 标题
+        /// </summary>
+
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int Sort { get; set; }
+
+        /// <summary>
+        /// 是否显示（前台）
+        /// </summary>
+        public int IsShow { get; set; }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        public DateStateEnum State { get; set; }
+
+        /// <summary>
+        /// 公司
+        /// </summary>        
+        public int? RB_Branch_Id
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 集团
+        /// </summary>        
+        public int? RB_Group_Id
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>        
+        public int? CreateBy
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>        
+        public int? UpdateBy
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Edu.Model/Entity/Survey/Rb_Education_SurveyOptions.cs

+using Edu.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Survey
+{
+    /// <summary>
+    /// 意见调查选项信息表
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Education_SurveyOptions
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int ID { get; set; }
+
+
+        /// <summary>
+        /// 调查表id
+        /// </summary>
+        public int SurveyID { get; set; }
+
+        /// <summary>
+        /// 选项名称
+        /// </summary>
+
+        public string OptionsName { get; set; }
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        public DateStateEnum State { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int Sort { get; set; }
+    }
+}

Edu.Model/ViewModel/DataStatistics/StudentFollowStatic.cs

@@ -28,6 +28,11 @@ namespace Edu.Model.ViewModel.DataStatistics
         /// </summary>
         public string StuTel { get; set; }
 
+        /// <summary>
+        /// 二维码图片信息
+        /// </summary>
+        public string QrCodeUrl { get; set; }
+
         /// <summary>
         /// 学员真实电话
         /// </summary>
@@ -61,7 +66,7 @@ namespace Edu.Model.ViewModel.DataStatistics
         /// <summary>
         /// 初报级别
         /// </summary>
-        public string  CourseRateName { get; set; }
+        public string CourseRateName { get; set; }
 
 
 

Edu.Model/ViewModel/Survey/Rb_Education_StudentSurvey_ViewModel.cs

+using Edu.Model.Entity.Survey;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Survey
+{
+    /// <summary>
+    /// 学生意见信息扩展表
+    /// </summary>
+    public class Rb_Education_StudentSurvey_ViewModel : Rb_Education_StudentSurvey
+    {
+        /// <summary>
+        /// 选项详情
+        /// </summary>
+        public List<Rb_Education_SurveyOptions_ViewModel> GuestSurveyDetailsList { get; set; }
+        /// <summary>
+        /// 旅客选项
+        /// </summary>
+        public List<Rb_Education_StudentSurveyDetails> SurveyOptionsList { get; set; }
+
+        /// <summary>
+        /// 1-有评分，-1无评分
+        /// </summary>
+        public int IsScore { get; set; }
+
+        /// <summary>
+        /// 分数
+        /// </summary>
+        public decimal ScoreNum { get; set; }
+
+        /// <summary>
+        /// 条数
+        /// </summary>
+        public int ScoreCount { get; set; }
+        /// <summary>
+        /// 填写开始日期
+        /// </summary>
+        public string QStartDate { get; set; }
+
+        /// <summary>
+        /// 填写结束日期
+        /// </summary>
+        public string QEndDate { get; set; }
+
+        /// <summary>
+        /// 老师名称
+        /// </summary>
+        public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 学生名称
+        /// </summary>
+        public string StudentName { get; set; }
+
+    }
+}

Edu.Model/ViewModel/Survey/Rb_Education_SurveyOptions_ViewModel.cs

+using Edu.Model.Entity.Survey;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Survey
+{
+    /// <summary>
+    /// 意见调查表选项扩展表
+    /// </summary>
+    public class Rb_Education_SurveyOptions_ViewModel : Rb_Education_SurveyOptions
+    {
+        /// <summary>
+        /// 单选多选（多选和单选(1)）
+        /// </summary>
+        public string IsCheck { get; set; }
+    }
+}

Edu.Model/ViewModel/Survey/Rb_Education_Survey_ViewModel.cs

+using Edu.Model.Entity.Survey;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Survey
+{
+    /// <summary>
+    /// 学生意见调查信息扩展表
+    /// </summary>
+    public class Rb_Education_Survey_ViewModel : Rb_Education_Survey
+    {
+        /// <summary>
+        /// 选项
+        /// </summary>
+        public List<Rb_Education_SurveyOptions_ViewModel> SurveyOptionsList { get; set; }
+
+
+        /// <summary>
+        /// 分数
+        /// </summary>
+        public int ScoreNum { get; set; }
+
+        /// <summary>
+        /// 文本内容
+        /// </summary>
+        public string TextContent { get; set; }
+
+        /// <summary>
+        /// 学生id
+        /// </summary>
+        public int StudentId { get; set; }
+
+        /// <summary>
+        /// 选项信息
+        /// </summary>
+        public List<int> CheckInfo { get; set; }
+    }
+}

Edu.Module.User/StudentStatModule.cs

@@ -408,6 +408,7 @@ namespace Edu.Module.User
                         }),
                         IsShowFollowAll = false,
                         NewLesson = NewLesson,
+                        QrCodeUrl = "",
                     };
                     RList.Add(followModel);
                 }

Edu.Repository/Survey/Rb_Education_StudentSurveyDetailsRepository.cs

+using Edu.Model.Entity.Survey;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Edu.Repository.Survey
+{
+    /// <summary>
+    /// 学生意见调查选项仓储类
+    /// </summary>
+    public class Rb_Education_StudentSurveyDetailsRepository : BaseRepository<Rb_Education_StudentSurveyDetails>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(Rb_Education_StudentSurveyDetails); } }
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_Education_StudentSurveyDetails> GetList(Rb_Education_StudentSurveyDetails where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from {TableName}  where 1=1");
+            if (where != null)
+            {
+                if (where.SurveyId > 0)
+                {
+                    sb.AppendFormat(" and SurveyId={0}", where.SurveyId);
+                }
+
+                if (where.StudentSurveyId > 0)
+                {
+                    sb.AppendFormat(" and StudentSurveyId={0}", where.StudentSurveyId);
+                }
+            }
+            return Get<Rb_Education_StudentSurveyDetails>(sb.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="GuestSurveyIds"></param>
+        /// <returns></returns>
+        public List<Rb_Education_StudentSurveyDetails> GetEducationStudentSurveyDetailsListRepository(string StudentSurveyIds)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from {TableName} where 1=1");
+            if (!string.IsNullOrWhiteSpace(StudentSurveyIds))
+            {
+                sb.AppendFormat(" and StudentSurveyId in({0})", StudentSurveyIds);
+            }
+            return Get<Rb_Education_StudentSurveyDetails>(sb.ToString()).ToList();
+        }
+
+    }
+}

Edu.Repository/Survey/Rb_Education_StudentSurveyRepository.cs

+using Edu.Model.Entity.Survey;
+using Edu.Model.ViewModel.Survey;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Edu.Repository.Survey
+{
+    /// <summary>
+    /// 学生意见填写仓储类
+    /// </summary>
+    public class Rb_Education_StudentSurveyRepository : BaseRepository<Rb_Education_StudentSurvey>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(Rb_Education_StudentSurvey); } }
+
+
+        /// <summary>
+        /// 获取旅客意见调查列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_Education_StudentSurvey_ViewModel> GetTravelGuestSurveyListRepository(Rb_Education_StudentSurvey_ViewModel where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * FROM {TableName} WHERE state=0");
+            if (where != null)
+            {
+
+                if (where.StudentId > 0)
+                {
+                    sb.AppendFormat(" and StudentId={0}", where.StudentId);
+                }
+                if (where.TeacherId > 0)
+                {
+                    sb.AppendFormat(" and TeacherId={0}", where.TeacherId);
+                }
+            }
+            return Get<Rb_Education_StudentSurvey_ViewModel>(sb.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_Education_StudentSurvey_ViewModel> GetListInfo(Rb_Education_StudentSurvey_ViewModel where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"
+SELECT a.*,IFNULL(c.ScoreNum,0) AS ScoreNum,IFNULL(c.ScoreCount,0) AS ScoreCount 
+FROM {TableName} AS a 
+LEFT JOIN (SELECT StudentSurveyId,SUM(ScoreNum) as ScoreNum,COUNT(GuestSurveyId) as ScoreCount FROM Rb_Education_StudentSurveyDetails WHERE ScoreNum>0 GROUP BY StudentSurveyId )  as c ON a.ID=c.StudentSurveyId
+WHERE a.state=0");
+            if (where != null)
+            {
+               
+                if (where.StudentId > 0)
+                {
+                    sb.AppendFormat(" and a.StudentId={0}", where.StudentId);
+                }
+                if (where.TeacherId > 0)
+                {
+                    sb.AppendFormat(" and a.TeacherId={0}", where.TeacherId);
+                }
+            }
+            return Get<Rb_Education_StudentSurvey_ViewModel>(sb.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_Education_StudentSurvey_ViewModel> GetTravelSurveyPageRepository(int pageIndex, int pageSize, out long rowsCount, Rb_Education_StudentSurvey_ViewModel where)
+        {
+            var parameters = new DynamicParameters();
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"
+SELECT a.*,IFNULL(c.ScoreNum,0) AS ScoreNum,IFNULL(c.ScoreCount,0) AS ScoreCount 
+FROM {TableName} AS a 
+LEFT JOIN (SELECT StudentSurveyId,SUM(ScoreNum) as ScoreNum,COUNT(StudentSurveyId) as ScoreCount FROM Rb_Education_StudentSurveyDetails WHERE ScoreNum>0 GROUP BY StudentSurveyId )  as c ON a.ID=c.StudentSurveyId
+WHERE a.state=0");
+            if (where != null)
+            {
+                if (where.StudentId > 0)
+                {
+                    sb.AppendFormat(" and a.StudentId={0}", where.StudentId);
+                }
+                if (where.TeacherId > 0)
+                {
+                    sb.AppendFormat(" and a.TeacherId={0}", where.TeacherId);
+                }
+               
+                if (!string.IsNullOrEmpty(where.QStartDate))
+                {
+                    sb.AppendFormat(" AND A.CreateDate>='{0}' ", where.QStartDate);
+                }
+                if (!string.IsNullOrEmpty(where.QEndDate))
+                {
+                    sb.AppendFormat(" AND A.CreateDate<='{0} 23:59:59' ", where.QEndDate);
+                }
+            }
+            sb.AppendFormat(" ORDER BY A.CreateDate ASC ");
+            return GetPage<Rb_Education_StudentSurvey_ViewModel>(pageIndex, pageSize, out rowsCount, sb.ToString(), parameters).ToList();
+        }
+
+
+    }
+}

Edu.Repository/Survey/Rb_Education_SurveyOptionsRepository.cs

+using Edu.Model.Entity.Survey;
+using Edu.Model.ViewModel.Survey;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Edu.Repository.Survey
+{
+    /// <summary>
+    /// 意见调查基础选项仓储类
+    /// </summary>
+    public class Rb_Education_SurveyOptionsRepository : BaseRepository<Rb_Education_SurveyOptions>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(Rb_Education_SurveyOptions); } }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_Education_SurveyOptions_ViewModel> GetList(Rb_Education_SurveyOptions where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from Rb_Education_SurveyOptions  where state=0");
+            if (where != null)
+            {
+                if (where.SurveyID > 0)
+                {
+                    sb.AppendFormat(" and SurveyID={0}", where.SurveyID);
+                }
+            }
+            sb.Append($" ORDER BY {nameof(Rb_Education_SurveyOptions.Sort)} ASC");
+            return Get<Rb_Education_SurveyOptions_ViewModel>(sb.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="SurveyIDs"></param>
+        /// <returns></returns>
+        public List<Rb_Education_SurveyOptions_ViewModel> GetList(string SurveyIDs)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from Rb_Education_SurveyOptions  where state=0");
+
+            if (!string.IsNullOrWhiteSpace(SurveyIDs))
+            {
+                sb.AppendFormat(" and SurveyID in({0})", SurveyIDs);
+            }
+            sb.Append($" ORDER BY {nameof(Rb_Education_SurveyOptions.Sort)} ASC");
+            return Get<Rb_Education_SurveyOptions_ViewModel>(sb.ToString()).ToList();
+        }
+    }
+}

Edu.Repository/Survey/Rb_Education_SurveyRepository.cs

+using Edu.Model.Entity.Survey;
+using Edu.Model.ViewModel.Survey;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Edu.Repository.Survey
+{
+    /// <summary>
+    /// 意见调查基础信息仓储类
+    /// </summary>
+    public class Rb_Education_SurveyRepository : BaseRepository<Rb_Education_Survey>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(Rb_Education_Survey); } }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_Education_Survey_ViewModel> GetList(Rb_Education_Survey where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from Rb_Education_Survey  where state=0");
+            if (where != null)
+            {
+                if (where.RB_Group_Id > 0)
+                {
+                    sb.AppendFormat(" and RB_Group_Id={0}", where.RB_Group_Id);
+                }
+                if (where.IsShow > 0)
+                {
+                    sb.AppendFormat(" and IsShow={0}", where.IsShow);
+                }
+                if (!string.IsNullOrWhiteSpace(where.Title))
+                {
+                    sb.AppendFormat(" and Title like'%{0}%'", where.Title);
+                }
+                if (where.SurveyType.HasValue && (int)where.SurveyType > 0)
+                {
+                    sb.AppendFormat(" and SurveyType={0}", (int)where.SurveyType);
+                }
+            }
+            sb.Append($" ORDER BY {nameof(Rb_Education_Survey.Sort)} ASC");
+            return Get<Rb_Education_Survey_ViewModel>(sb.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="SurveyIDs"></param>
+        /// <returns></returns>
+        public List<Rb_Education_Survey_ViewModel> GetList(string SurveyIDs)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from Rb_Education_Survey  where state=0");
+
+            if (!string.IsNullOrWhiteSpace(SurveyIDs))
+            {
+                sb.AppendFormat(" and ID in({0})", SurveyIDs);
+            }
+            sb.Append($" ORDER BY {nameof(Rb_Education_Survey.Sort)} ASC");
+            return Get<Rb_Education_Survey_ViewModel>(sb.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 意见调查表配置项分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Rb_Education_Survey_ViewModel> GetPageList(int pageIndex, int pageSize, out long rowsCount, Rb_Education_Survey where)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append($@"SELECT * from Rb_Education_Survey  where state=0");
+            if (where != null)
+            {
+                if (where.IsShow > -1)
+                {
+                    sb.AppendFormat(" and IsShow={0}", where.IsShow);
+                }
+
+                if (where.SurveyType.HasValue && (int)where.SurveyType > 0)
+                {
+                    sb.AppendFormat(" and SurveyType={0}", (int)where.SurveyType);
+                }
+                if (!string.IsNullOrWhiteSpace(where.Title))
+                {
+                    sb.AppendFormat(" and Title like'%{0}%'", where.Title);
+                }
+            }
+            sb.Append($" ORDER BY {nameof(Rb_Education_Survey.Sort)} ASC");
+            return GetPage<Rb_Education_Survey_ViewModel>(pageIndex, pageSize, out rowsCount, sb.ToString()).ToList();
+        }
+    }
+}

Edu.Repository/User/RB_StudentRepository.cs

@@ -1457,5 +1457,89 @@ where e.ClassScrollType=2 and c.OrderState=1
             return GetPage<RB_Student_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
 
+
+        /// <summary>
+        /// 获取学生列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Student_ViewModel> GetStudentListByStuIdsRepository(RB_Student_ViewModel query)
+        {
+            var parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+           
+                builder.AppendFormat(@"
+SELECT t.* 
+FROM rb_student AS t 
+WHERE 1=1 
+");
+          
+           // builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (!string.IsNullOrWhiteSpace(query.StuName))
+                {
+                    builder.AppendFormat(" AND t.{0} LIKE @StuName ", nameof(RB_Student_ViewModel.StuName));
+                    parameters.Add("StuName", "%" + query.StuName.Trim() + "%");
+                }
+                if (!string.IsNullOrWhiteSpace(query.StuTel))
+                {
+                    builder.AppendFormat(" AND t.{0} LIKE @StuTel ", nameof(RB_Student_ViewModel.StuTel));
+                    parameters.Add("StuTel", "%" + query.StuTel.Trim() + "%");
+                }
+                if (query.ProviceId > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.ProviceId), query.ProviceId);
+                }
+                if (query.CityId > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.CityId), query.CityId);
+                }
+                if (query.AreaId > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.AreaId), query.AreaId);
+                }
+                if (query.CustomerId > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.CustomerId), query.CustomerId);
+                }
+                if (query.StuId > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.StuId), query.StuId);
+                }
+                if (!string.IsNullOrEmpty(query.StuIds))
+                {
+                    builder.AppendFormat(" AND t.{0} in({1}) ", nameof(RB_Student_ViewModel.StuId), query.StuIds);
+                }
+                if (query.StuStage > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.StuStage), (int)query.StuStage);
+                }
+                if (query.CreateBy > 0)
+                {
+                    builder.AppendFormat(" AND t.{0}={1} ", nameof(RB_Student_ViewModel.CreateBy), query.CreateBy);
+                }
+                if (!string.IsNullOrEmpty(query.QCreateBys))
+                {
+                    builder.AppendFormat(@" AND (t.CreateBy IN({0}) OR t.StuId IN(SELECT StuId FROM rb_student_assist WHERE AssistId IN({0}) AND `Status`= 0) ) ", query.QCreateBys);
+                }
+                if (!string.IsNullOrEmpty(query.StartTime))
+                {
+                    builder.AppendFormat(" AND t.{0}>='{1}' ", nameof(RB_Student_ViewModel.CreateTime), query.StartTime);
+                }
+                if (!string.IsNullOrEmpty(query.EndTime))
+                {
+                    builder.AppendFormat(" AND t.{0}<='{1} 23:59:59' ", nameof(RB_Student_ViewModel.CreateTime), query.EndTime);
+                }
+            }
+            var stuList = Get<RB_Student_ViewModel>(builder.ToString(), parameters).ToList();
+           
+            return stuList;
+        }
+
     }
 }
\ No newline at end of file

Edu.Repository/User/RB_TeacherRepository.cs

@@ -252,5 +252,25 @@ WHERE 1=1
             return Get<RB_Teacher_ViewModel>(builder.ToString(), parameters).ToList();
         }
 
+
+        /// <summary>
+        /// 获取教师账户
+        /// </summary>
+        /// <param name="teacherIds"></param>
+        /// <returns></returns>
+        public List<RB_Teacher_ViewModel> GetTeacherByTeacherIdsList(string teacherIds)
+        {
+            var parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT t.*
+FROM rb_teacher AS t 
+WHERE 1=1 
+");
+            builder.AppendFormat(" AND t.{0} IN({1}) ", nameof(RB_Teacher_ViewModel.TId), teacherIds);
+            return Get<RB_Teacher_ViewModel>(builder.ToString(), parameters).ToList();
+        }
+
+
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/User/UserController.cs

@@ -430,6 +430,25 @@ namespace Edu.WebApi.Controllers.User
             return ApiResult.Success(data: list);
         }
 
+
+
+        /// <summary>
+        /// 获取讲师列表2024-07-02 add by:w 学生问卷调查老师信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [HttpGet]
+        [AllowAnonymous]
+        public ApiResult GetTeacherListByGroupId()
+        {
+            var query = new RB_Teacher_ViewModel()
+            {
+                Group_Id = base.ParmJObj.GetInt("RB_Group_Id")
+            };
+            var list = teacherModule.GetTeacherListModule(query);
+            return ApiResult.Success(data: list);
+        }
+
         /// <summary>
         /// 添加修改讲师
         /// </summary>

Edu.WebApi/appsettings.json

@@ -30,6 +30,7 @@
   "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
   "ErpViewFileSiteUrl": "http://imgfile.oytour.com",
   "ErpUrl": "http://localhost:8181/#",
+  "EducationUrl": "http://localhost:8181/",
   "WorkAPPDomain": "http://m.kookaku.com/pages",
   "Mongo": "mongodb://47.96.23.199:27017",
   "MongoDBName": "Edu",