bug fix

New_College.Api/Controllers/Front/EvaluationsController.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using New_College.IServices;
+using New_College.Model;
+using New_College.Model.ViewModels.Query;
+using New_College.Model.ViewModels.Result;
+
+namespace New_College.Api.Controllers.Front
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class EvaluationsController : ControllerBase
+    {
+
+        private readonly ITest_PsychMeasurementInfoServices _test_Psych;
+        public EvaluationsController(ITest_PsychMeasurementInfoServices _PsychMeasurementInfoServices)
+        {
+            this._test_Psych = _PsychMeasurementInfoServices;
+        }
+
+        /// <summary>
+        /// 测评结果列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<MessageModel<List<EvaluationResponse>>> GetEvaluations([FromQuery] EvaluationRequest request)
+        {
+            try
+            {
+                var result = await this._test_Psych.GetEvaluations(request);
+                return new MessageModel<List<EvaluationResponse>>()
+                {
+                    msg = "success",
+                    response = result,
+                    success = true
+                };
+            }
+            catch (Exception ex)
+            {
+
+                return new MessageModel<List<EvaluationResponse>>()
+                {
+                    msg = ex.Message
+                };
+            }
+        }
+
+    }
+}

New_College.Api/Controllers/Front/FeedBackController.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using New_College.IServices;
+using New_College.Model;
+using New_College.Model.ViewModels.Query;
+
+namespace New_College.Api.Controllers.Front
+{
+    [Route("api/front/[controller]/[action]")]
+    [ApiController]
+    public class FeedBackController : ControllerBase
+    {
+
+        private readonly IFeedbackInfoServices feedback;
+        public FeedBackController(IFeedbackInfoServices feedbackInfoServices)
+        {
+            this.feedback = feedbackInfoServices;
+        }
+
+
+
+      
+        /// <summary>
+        /// 用户反馈
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<MessageModel<string>> Add(FeedBackRequest request)
+        {
+            try
+            {
+                var status = await feedback.Add(new Model.Models.FeedbackInfo()
+                {
+                    Content = request.Content,
+                    CustomerId = request.CustomerId,
+                    Title = request.Title
+                });
+
+                return new MessageModel<string>()
+                {
+                    response = "系统已收到您的反馈！！！我们平台运维人员将对您的问题做统计分类，请您耐心等待后续反馈",
+                    msg = "success",
+                    success = true
+                };
+            }
+            catch (Exception ex)
+            {
+
+                return new MessageModel<string>()
+                {
+                    msg = ex.Message
+                };
+            }
+        }
+
+
+
+
+    }
+}

New_College.Api/Controllers/Front/FrontSelectionController.cs

@@ -40,24 +40,20 @@ namespace New_College.Api.Controllers.Front
         {
             try
             {
-                var wheres = PredicateBuilder.New<SubjectSelection>();
+                var query = new List<string>();
 
-                if (request.UniversityName.Any())
+
+                var subjectlist = new PageModel<SubjectSelection>();
+                if (request.UniversityName != null)
                 {
-                    request.UniversityName.ForEach(a => {
+                    query = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(request.UniversityName);
-                        wheres = wheres.Or(x => x.UniversityName.Contains(a));
+                    subjectlist = await _selectionServices.QueryPage(w => query.Contains(w.UniversityName), request.PageIndex, request.PageSize);
-                    });
-                   
                 }
-
+                if (request.MajorName != null)
-                if (request.MajorName.Any())
                 {
-                    request.UniversityName.ForEach(a => {
+                    query = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(request.MajorName);
-                        wheres = wheres.Or(x => x.MajorName.Contains(a));
+                    subjectlist = await _selectionServices.QueryPage(w => query.Contains(w.MajorName), request.PageIndex, request.PageSize);
-                    });
                 }
-                var subjectlist = await _selectionServices.QueryPage(wheres, request.PageIndex, request.PageSize);
-
                 return new MessageModel<PageModel<SubjectSelection>>()
                 {
                     msg = "success",

New_College.Api/Controllers/Front/LibraryController.cs

@@ -69,6 +69,24 @@ namespace New_College.Api.Controllers.Front
             };
         }
 
+
+        /// <summary>
+        /// 根据一级专业Id获取二三级专业数据
+        /// </summary>
+        /// <param name="tradeId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<MessageModel<List<TreeMajorInfoResult>>> GetTreeMajors([FromQuery] int tradeId)
+        {
+            var result = await iD_LongIdMapServices.GetTreeMajors(tradeId);
+            return new MessageModel<List<TreeMajorInfoResult>>()
+            {
+                success = result.Count <= 0 ? false : true,
+                msg = result.Count <= 0 ? "获取失败" : "获取成功",
+                response = result
+            };
+        }
+
         /// <summary>
         /// 获取推荐职业
         /// </summary>

New_College.Api/Controllers/Front/MyHistoryInfoController.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using New_College.IServices;
+using New_College.Model;
+using New_College.Model.ViewModels.Result;
+
+namespace New_College.Api.Controllers.Front
+{
+    /// <summary>
+    /// 历史大学
+    /// </summary>
+    [Route("api/front/[controller]/[action]")]
+    [ApiController]
+    public class MyHistoryInfoController : ControllerBase
+    {
+        private readonly ID_MyHistoryInfoServices _MyHistory;
+        private readonly ID_UniversityServices _UniversityServices;
+        public MyHistoryInfoController(ID_MyHistoryInfoServices d_MyHistoryInfoServices, ID_UniversityServices d_UniversityServices)
+        {
+            this._MyHistory = d_MyHistoryInfoServices;
+            this._UniversityServices = d_UniversityServices;
+        }
+
+
+        /// <summary>
+        /// 浏览历史记录列表
+        /// </summary>
+        /// <param name="CustomerId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<MessageModel<List<MyHistoryResponse>>> GetMyHistory([FromQuery] int CustomerId)
+        {
+            var response = new List<MyHistoryResponse>();
+            try
+            {
+                var query = await _MyHistory.Query(e => e.UId == CustomerId);
+                if (query.Any())
+                {
+                    var uids = query.Select(s => s.UId).ToList();
+                    var universitysinfo = await this._UniversityServices.Query(q => uids.Contains(q.Id));
+                    response = universitysinfo.Select(s => new MyHistoryResponse()
+                    {
+                        AreaName = s.Area_Name,
+                        Id = s.Id,
+                        Logo = s.Logo,
+                        Name = s.Name,
+                        Nature = s.Nature,
+                        Rank = s.Rank,
+                        Syl = s.Syl == 1 ? true : false,
+                        Nhef = s.Nhef == 1 ? true : false,
+                        Sff = s.Sff == 1 ? true : false        
+                    }).ToList();
+                }
+                return new MessageModel<List<MyHistoryResponse>>()
+                {
+                    msg = "success",
+                    response = response,
+                    success = true
+                };
+            }
+            catch (Exception ex)
+            {
+                return new MessageModel<List<MyHistoryResponse>>()
+                {
+                    msg = ex.Message
+                };
+            }
+
+
+        }
+
+
+
+    }
+}

New_College.Api/New_College.Model.xml

@@ -440,6 +440,16 @@
             薪资
             </summary>
         </member>
+        <member name="P:New_College.Model.Models.D_MyHistoryInfo.UId">
+            <summary>
+            记录Id
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.D_MyHistoryInfo.Type">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:New_College.Model.Models.D_NewsInfo.Author">
             <summary>
             
@@ -635,6 +645,11 @@
             排名
             </summary>
         </member>
+        <member name="T:New_College.Model.Models.FeedbackInfo">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:New_College.Model.Models.Guestbook.id">
             <summary>
             留言表
@@ -3509,9 +3524,9 @@
             高考年份
             </summary>
         </member>
-        <member name="P:New_College.Model.ViewModels.CWBEnrollmentPlaneQuery.BatchId">
+        <member name="P:New_College.Model.ViewModels.CWBEnrollmentPlaneQuery.AreaId">
             <summary>
-            批次Id
+            省份Id
             </summary>
         </member>
         <member name="P:New_College.Model.ViewModels.CWBEnrollmentPlaneQuery.Score">
@@ -3519,6 +3534,11 @@
             学生预估分数
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.CWBEnrollmentPlaneQuery.BatchId">
+            <summary>
+            批次Id
+            </summary>
+        </member>
         <member name="P:New_College.Model.ViewModels.CWBEnrollmentPlaneQuery.UniversityAreaName">
             <summary>
             学校省份
@@ -4139,6 +4159,56 @@
             招生人数
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.Result.EvaluationResponse.Status">
+            <summary>
+            0未测评，1已测评
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.Result.MyHistoryResponse.Id">
+            <summary>
+            主键id
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.Result.MyHistoryResponse.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.Result.MyHistoryResponse.Rank">
+            <summary>
+            排名
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.Result.MyHistoryResponse.Nhef">
+            <summary>
+            是否985
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.Result.MyHistoryResponse.Sff">
+            <summary>
+            是否211
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.Result.MyHistoryResponse.Syl">
+            <summary>
+            是否双一流
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.Result.MyHistoryResponse.Logo">
+            <summary>
+            学校logo
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.Result.MyHistoryResponse.AreaName">
+            <summary>
+            省市区名称
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.Result.MyHistoryResponse.Nature">
+            <summary>
+            办学性质
+            </summary>
+        </member>
         <member name="P:New_College.Model.ViewModels.ExaminationPolicyResult.AreaName">
             <summary>
             省份名称
@@ -5184,6 +5254,11 @@
             学校logo
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.SimuVolunteerTableResult.Nature">
+            <summary>
+            办学性质
+            </summary>
+        </member>
         <member name="T:New_College.Model.ViewModels.WeChatPubResult">
             <summary>
             

New_College.Api/New_College.xml

@@ -162,6 +162,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:New_College.Api.Controllers.Front.EvaluationsController.GetEvaluations(New_College.Model.ViewModels.Query.EvaluationRequest)">
+            <summary>
+            测评结果列表
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:New_College.Api.Controllers.Front.ExaminationPolicyController.GetExaminationPolicyDetail(New_College.Model.ViewModels.ExaminationPolicyAreaQuery)">
             <summary>
             获取考试时间
@@ -187,6 +194,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:New_College.Api.Controllers.Front.FeedBackController.Add(New_College.Model.ViewModels.Query.FeedBackRequest)">
+            <summary>
+            用户反馈
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="T:New_College.Api.Controllers.Front.FrontSelectionController">
             <summary>
             新高考选科
@@ -213,6 +227,13 @@
             <param name="query"></param>
             <returns></returns>
         </member>
+        <member name="M:New_College.Api.Controllers.Front.LibraryController.GetTreeMajors(System.Int32)">
+            <summary>
+            根据一级专业Id获取二三级专业数据
+            </summary>
+            <param name="tradeId"></param>
+            <returns></returns>
+        </member>
         <member name="M:New_College.Api.Controllers.Front.LibraryController.GetRecommendOccupation">
             <summary>
             获取推荐职业
@@ -335,6 +356,18 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:New_College.Api.Controllers.Front.MyHistoryInfoController">
+            <summary>
+            历史大学
+            </summary>
+        </member>
+        <member name="M:New_College.Api.Controllers.Front.MyHistoryInfoController.GetMyHistory(System.Int32)">
+            <summary>
+            浏览历史记录列表
+            </summary>
+            <param name="CustomerId"></param>
+            <returns></returns>
+        </member>
         <member name="M:New_College.Api.Controllers.Front.NewsInfoController.GetTopNews(New_College.Model.Request.NewsRequest)">
             <summary>
             获取top多少的新闻

New_College.IServices/ID_LongIdMapServices.cs

@@ -18,6 +18,13 @@ namespace New_College.IServices
 
         Task<List<uniMajorInfoResult>> uniGetMajorInfo(MajorcategoryQuery query);
 
+        /// <summary>
+        /// 根据一级分类id获取二三级分类数据
+        /// </summary>
+        /// <param name="tradeId"></param>
+        /// <returns></returns>
+        Task<List<TreeMajorInfoResult>> GetTreeMajors(int tradeId);
+
         Task<List<OccupationResult>> GetRecommendOccupation();
 
         Task<List<uniMajorInfoResult>> uniGetOccupationInfo();

New_College.IServices/ID_MyHistoryInfoServices.cs

@@ -0,0 +1,12 @@
+using New_College.IServices.BASE;
+using New_College.Model.Models;
+
+namespace New_College.IServices
+{	
+	/// <summary>
+	/// ID_MyHistoryInfoServices
+	/// </summary>	
+    public interface ID_MyHistoryInfoServices :IBaseServices<D_MyHistoryInfo>
+	{
+    }
+}

New_College.IServices/IFeedbackInfoServices.cs

@@ -0,0 +1,12 @@
+using New_College.IServices.BASE;
+using New_College.Model.Models;
+
+namespace New_College.IServices
+{	
+	/// <summary>
+	/// IFeedbackInfoServices
+	/// </summary>	
+    public interface IFeedbackInfoServices :IBaseServices<FeedbackInfo>
+	{
+    }
+}

New_College.IServices/ITest_PsychMeasurementInfoServices.cs

@@ -2,6 +2,8 @@
 using New_College.Model;
 using New_College.Model.Models;
 using New_College.Model.ViewModels;
+using New_College.Model.ViewModels.Query;
+using New_College.Model.ViewModels.Result;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -62,5 +64,13 @@ namespace New_College.IServices
         /// <returns></returns>
         Task<MessageModel<string>> GetHollandSubject(HollandSubjectQuery query);
 
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<List<EvaluationResponse>> GetEvaluations(EvaluationRequest request);
+
     }
 }

New_College.Model/Models/D_MyHistoryInfo.cs

@@ -0,0 +1,24 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace New_College.Model.Models
+{
+    [SugarTable("D_MyHistoryInfo", "WMBLOG_MYSQL")]
+    public class D_MyHistoryInfo : EntityModel
+    {
+        public int CustomerId { get; set; }
+
+        /// <summary>
+        /// 记录Id
+        /// </summary>
+        public int UId { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int Type { get; set; }
+
+    }
+}

New_College.Model/Models/FeedbackInfo.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+
+namespace New_College.Model.Models
+{
+    ///<summary>
+    ///
+    ///</summary>
+    [SugarTable("FeedbackInfo", "WMBLOG_MYSQL")]
+    public class FeedbackInfo:EntityModel
+    {
+
+        public int? CustomerId { get; set; }
+
+        public string Title { get; set; }
+
+        public string Content { get; set; }
+    }
+}

New_College.Model/Request/SelectionServiceRequest.cs

@@ -7,9 +7,9 @@ namespace New_College.Model.Request
 {
     public class SelectionServiceRequest: BasePageRequest
     {
-        public List<string> UniversityName { get; set; }
+        public string UniversityName { get; set; }
 
-        public List<string> MajorName { get; set; }
+        public string MajorName { get; set; }
 
     }
 }

New_College.Model/ViewModels/BaseResult.cs

@@ -17,6 +17,7 @@ namespace New_College.Model.ViewModels
 
     public class IdQuery
     {
+        public int? CustomerId { get; set; }
         public int Id { get; set; }
 
         public List<int> Ids { get; set; }

New_College.Model/ViewModels/Query/EvaluationRequest.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace New_College.Model.ViewModels.Query
+{
+    public class EvaluationRequest
+    {
+        public int CustomerId { get; set; }
+    }
+}

New_College.Model/ViewModels/Query/FeedBackRequest.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace New_College.Model.ViewModels.Query
+{
+   public class FeedBackRequest
+    {
+        public int CustomerId { get; set; }
+
+        public string Title { get; set; }
+
+        public string Content { get; set; }
+    }
+}

New_College.Model/ViewModels/Query/TagEnrollmentPlaneQuery.cs

@@ -121,15 +121,19 @@ namespace New_College.Model.ViewModels
         public int Year { get; set; }
 
         /// <summary>
-        /// 批次Id
+        /// 省份Id
         /// </summary>
-        public int BatchId { get; set; }
+        public int AreaId { get; set; }
 
         /// <summary>
         /// 学生预估分数
         /// </summary>
         public float Score { get; set; }
 
+        /// <summary>
+        /// 批次Id
+        /// </summary>
+        public int BatchId { get; set; }
         /// <summary>
         /// 学校省份
         /// </summary>

New_College.Model/ViewModels/Result/EvaluationResponse.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace New_College.Model.ViewModels.Result
+{
+    public class EvaluationResponse
+    {
+        public int PId { get; set; }
+
+        public string Title { get; set; }
+        public string Message { get; set; }
+
+        /// <summary>
+        /// 0未测评，1已测评
+        /// </summary>
+        public int Status { get; set; } = 0;
+    }
+}

New_College.Model/ViewModels/Result/MyHistoryResponse.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace New_College.Model.ViewModels.Result
+{
+    public class MyHistoryResponse
+    {
+        /// <summary>
+        /// 主键id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 排名
+        /// </summary>
+        public int? Rank { get; set; }
+        /// <summary>
+        /// 是否985
+        /// </summary>
+        public bool? Nhef { get; set; }
+        /// <summary>
+        /// 是否211
+        /// </summary>
+        public bool? Sff { get; set; }
+        /// <summary>
+        /// 是否双一流
+        /// </summary>
+        public bool? Syl { get; set; }
+        /// <summary>
+        /// 学校logo
+        /// </summary>
+        public string Logo { get; set; }
+  
+        /// <summary>
+        /// 省市区名称
+        /// </summary>
+        public string AreaName { get; set; }
+        /// <summary>
+        /// 办学性质
+        /// </summary>
+        public int Nature { get; set; }
+   
+    }
+}

New_College.Model/ViewModels/Result/VolunteerResult.cs

@@ -34,6 +34,9 @@ namespace New_College.Model.ViewModels
 
         public List<PlanInfo> Infos { get; set; }
 
+        public string AreaName { get; set; }
+
+        public string Year { get; set; }
         /// <summary>
         /// 行政名称
         /// </summary>

New_College.Model/ViewModels/Result/VolunteerTableResult.cs

@@ -12,6 +12,14 @@ namespace New_College.Model.ViewModels
         public int UniversityId { get; set; }
 
         public string UniversityName { get; set; }
+        /// <summary>
+        /// 省市区名称
+        /// </summary>
+        public string AreaName { get; set; }
+        /// <summary>
+        /// 年份
+        /// </summary>
+        public int Year { get; set; }
 
         public List<PlanInfo> Infos { get; set; }
     }
@@ -27,6 +35,7 @@ namespace New_College.Model.ViewModels
         public string Year { get; set; }
 
         public string Money { get; set; }
+        public string YearName { get; set; }
 
         public float Scoreline { get; set; }
     }
@@ -75,6 +84,13 @@ namespace New_College.Model.ViewModels
 
         public string UniversityName { get; set; }
 
+        public string Province { get; set; }
+ 
+        /// <summary>
+        /// 办学性质
+        /// </summary>
+        public int Nature { get; set; }
+
         public List<PlanInfo> Infos { get; set; }
     }
 }

New_College.Model/ViewModels/Result/uniMajorSecond.cs

@@ -24,6 +24,7 @@ namespace New_College.Model.ViewModels
     /// </summary>
     public class uniMajorInfoResult
     {
+        public int RootId { get; set; }
         public string FirstName { get; set; }
         public List<uniMajorSecond> SecondInfo { get; set; }
         public int MajorNum { get; set; }
@@ -37,4 +38,14 @@ namespace New_College.Model.ViewModels
         public string MajorName { get; set; }
         public int MajorNum { get; set; }
     }
+
+
+    public class TreeMajorInfoResult
+    {
+        public int MajorClassId { get; set; }
+        public string MajorClassName { get; set; }
+        public List<uniMajorSelect> MajorsInfo { get; set; }
+    }
+
+
 }

New_College.Repository/BASE/D_MyHistoryInfoRepository.cs

@@ -0,0 +1,17 @@
+using New_College.IRepository;
+using New_College.IRepository.UnitOfWork;
+using New_College.Model.Models;
+using New_College.Repository.Base;
+
+namespace New_College.Repository
+{
+	/// <summary>
+	/// D_MyHistoryInfoRepository
+	/// </summary>
+    public class D_MyHistoryInfoRepository : BaseRepository<D_MyHistoryInfo>, ID_MyHistoryInfoRepository
+    {
+        public D_MyHistoryInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
+        {
+        }
+    }
+}

New_College.Repository/BASE/FeedbackInfoRepository.cs

@@ -0,0 +1,17 @@
+using New_College.IRepository;
+using New_College.IRepository.UnitOfWork;
+using New_College.Model.Models;
+using New_College.Repository.Base;
+
+namespace New_College.Repository
+{
+	/// <summary>
+	/// FeedbackInfoRepository
+	/// </summary>
+    public class FeedbackInfoRepository : BaseRepository<FeedbackInfo>, IFeedbackInfoRepository
+    {
+        public FeedbackInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
+        {
+        }
+    }
+}

New_College.Repository/BASE/ID_MyHistoryInfoRepository.cs

@@ -0,0 +1,12 @@
+using New_College.IRepository.Base;
+using New_College.Model.Models;
+
+namespace New_College.IRepository
+{
+	/// <summary>
+	/// ID_MyHistoryInfoRepository
+	/// </summary>	
+    public interface ID_MyHistoryInfoRepository : IBaseRepository<D_MyHistoryInfo>
+    {
+    }
+}

New_College.Repository/BASE/IFeedbackInfoRepository.cs

@@ -0,0 +1,12 @@
+using New_College.IRepository.Base;
+using New_College.Model.Models;
+
+namespace New_College.IRepository
+{
+	/// <summary>
+	/// IFeedbackInfoRepository
+	/// </summary>	
+    public interface IFeedbackInfoRepository : IBaseRepository<FeedbackInfo>
+    {
+    }
+}

New_College.Services/D_LongIdMapServices.cs

@@ -43,7 +43,7 @@ namespace New_College.Services
         private readonly IT_EnrollmentBatchRepository t_EnrollmentBatchRepository;
         private readonly ID_GraduateFlowRepository d_GraduateFlowRepository;
         private readonly IT_EnrollmentPlaneRepository t_EnrollmentPlaneRepository;
-
+        private readonly ID_MyHistoryInfoServices d_MyHistory;
         public D_LongIdMapServices(IBaseRepository<D_LongIdMap> dal
             , ID_MajorCategoryRepository ID_MajorCategoryRepository
             , ID_MajorClassRepository ID_MajorClassRepository
@@ -63,7 +63,7 @@ namespace New_College.Services
             , IT_EnrollmentPlanedescRepository IT_EnrollmentPlanedescRepository
             , IT_EnrollmentBatchRepository IT_EnrollmentBatchRepository
             , ID_GraduateFlowRepository ID_GraduateFlowRepository
-            , IT_EnrollmentPlaneRepository IT_EnrollmentPlaneRepository)
+            , IT_EnrollmentPlaneRepository IT_EnrollmentPlaneRepository, ID_MyHistoryInfoServices d_MyHistoryInfoServices)
         {
             this._dal = dal;
             d_MajorCategoryRepository = ID_MajorCategoryRepository;
@@ -86,6 +86,7 @@ namespace New_College.Services
             d_GraduateFlowRepository = ID_GraduateFlowRepository;
             t_EnrollmentPlaneRepository = IT_EnrollmentPlaneRepository;
             base.BaseDal = dal;
+            this.d_MyHistory = d_MyHistoryInfoServices;
         }
 
         /// <summary>
@@ -185,12 +186,41 @@ namespace New_College.Services
                 list.Add(new uniMajorInfoResult()
                 {
                     FirstName = item.Name,
+                    RootId = item.Id,
                     SecondInfo = scond
                 });
             }
             return list;
         }
 
+
+
+        /// <summary>
+        /// 根据一级分类id 获取二级三级专业数据
+        /// </summary>
+        /// <param name="tradeId"></param>
+        /// <returns></returns>
+        public async Task<List<TreeMajorInfoResult>> GetTreeMajors(int tradeId)
+        {
+            var result = new List<TreeMajorInfoResult>();
+            var classmajors = (await d_MajorClassRepository.Query(x => x.IsDelete == false && x.TradeId == tradeId)).Select(x => new uniMajorClassSelect() { Id = x.Id, Name = x.Name, TradeId = x.TradeId }).ToList();
+            var majorinfo = (await d_MajorRepository.Query(x => x.IsDelete == false)).Select(s => new uniMajorClassSelect() { Id = s.Id, TradeId = s.CategoryClass_Id, Name = s.Name }).ToList();
+            classmajors.ForEach(a =>
+            {
+                var models = new TreeMajorInfoResult();
+                models.MajorClassId = a.Id;
+                models.MajorClassName = a.Name;
+                models.MajorsInfo = majorinfo.Where(e => e.TradeId == a.Id).Select(s => new uniMajorSelect()
+                {
+                    Id = s.Id,
+                    Name = s.Name
+                }).ToList();
+                result.Add(models);
+            });
+            return result;
+        }
+
+
         /// <summary>
         /// 获取推荐职业
         /// </summary>
@@ -252,6 +282,16 @@ namespace New_College.Services
             {
                 imgs = imglist.ImgList;
             }
+            if (query.CustomerId.HasValue && query.CustomerId.Value > 0)
+            {
+                await d_MyHistory.Add(new D_MyHistoryInfo()
+                {
+
+                    OrderSort = 0,
+                    Type = 0,
+                    UId = query.CustomerId.Value
+                });
+            }
             result.universityResult = new UniversityResult
             {
                 Id = university.Id,

New_College.Services/D_MyHistoryInfoServices.cs

@@ -0,0 +1,18 @@
+
+using New_College.IServices;
+using New_College.Model.Models;
+using New_College.Services.BASE;
+using New_College.IRepository.Base;
+
+namespace New_College.Services
+{
+    public class D_MyHistoryInfoServices : BaseServices<D_MyHistoryInfo>, ID_MyHistoryInfoServices
+    {
+        private readonly IBaseRepository<D_MyHistoryInfo> _dal;
+        public D_MyHistoryInfoServices(IBaseRepository<D_MyHistoryInfo> dal)
+        {
+            this._dal = dal;
+            base.BaseDal = dal;
+        }
+    }
+}

New_College.Services/FeedbackInfoServices.cs

@@ -0,0 +1,18 @@
+
+using New_College.IServices;
+using New_College.Model.Models;
+using New_College.Services.BASE;
+using New_College.IRepository.Base;
+
+namespace New_College.Services
+{
+    public class FeedbackInfoServices : BaseServices<FeedbackInfo>, IFeedbackInfoServices
+    {
+        private readonly IBaseRepository<FeedbackInfo> _dal;
+        public FeedbackInfoServices(IBaseRepository<FeedbackInfo> dal)
+        {
+            this._dal = dal;
+            base.BaseDal = dal;
+        }
+    }
+}

New_College.Services/T_EnrollmentPlanedescServices.cs

@@ -34,7 +34,7 @@ namespace New_College.Services
         private readonly IU_VolunteerTableDetailRepository u_VolunteerTableDetailRepository;
         private readonly ID_UniversityCollectionRepository d_UniversityCollectionRepository;
         private readonly IT_GearInfoRepository t_GearInfo;
-
+        private readonly IT_EnrollmentPlanedescRepository t_EnrollmentPlanedesc;
         public T_EnrollmentPlanedescServices(IBaseRepository<T_EnrollmentPlanedesc> dal
             , ID_UniversityRepository ID_UniversityRepository
             , IT_EnrollmentBatchRepository IT_EnrollmentBatchRepository
@@ -49,7 +49,7 @@ namespace New_College.Services
             , IU_VolunteerTableRepository IU_VolunteerTableRepository
             , IU_VolunteerTableDetailRepository IU_VolunteerTableDetailRepository
             , ID_UniversityCollectionRepository ID_UniversityCollectionRepository
-            , IT_GearInfoRepository IT_GearInfoRepository)
+            , IT_GearInfoRepository IT_GearInfoRepository, IT_EnrollmentPlanedescRepository t_EnrollmentPlanedescServices)
         {
             this._dal = dal;
             d_UniversityRepository = ID_UniversityRepository;
@@ -67,6 +67,7 @@ namespace New_College.Services
             d_UniversityCollectionRepository = ID_UniversityCollectionRepository;
             t_GearInfo = IT_GearInfoRepository;
             base.BaseDal = dal;
+            this.t_EnrollmentPlanedesc = t_EnrollmentPlanedescServices;
         }
 
         public List<string> permut = new List<string>();
@@ -986,6 +987,8 @@ namespace New_College.Services
                     Nhef = item.Nhef,
                     Sff = item.Sff,
                     Syl = item.Syl,
+                    AreaName = item.Area_Name,
+                    Year = query.Year,
                     Infos = plansinfo.Select(x => new PlanInfo()
                     {
                         MajorId = x.Id,
@@ -1088,7 +1091,7 @@ namespace New_College.Services
             //所选科目  分数 
             if (query.Score <= 0)
                 return new MessageModel<List<CWBEnrollmentPlanResult>>() { success = false, msg = "分数不能为0..." };
-            var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Id == query.BatchId);
+            var planinfo = await t_EnrollmentPlaneRepository.Query(w => w.Area_Id == query.AreaId && w.Years == query.Year);
             if (planinfo == null)
                 return new MessageModel<List<CWBEnrollmentPlanResult>>() { success = false, msg = "所选省份年份的招生计划，正在完善中..." };
             //筛选符合条件的院校ids
@@ -1203,7 +1206,13 @@ namespace New_College.Services
             if (planinfo == null)
                 return new MessageModel<PageModel<UniversityEnrollmentPlanResult>>() { success = false, msg = "所选省份年份的招生计划，正在完善中..." };
             var wheres = PredicateBuilder.New<T_EnrollmentPlanedesc>();
-            wheres.And(x => query.UniversityIds.Contains(x.UniversityId) && x.IsDelete == false && x.PlanId == planinfo.FirstOrDefault().Id && x.UniversityId > 0);
+            wheres.And(x => x.IsDelete == false && x.PlanId == planinfo.FirstOrDefault().Id && x.UniversityId > 0);
+            wheres.And(x => x.Scoreline > 0);
+            if (query.UniversityIds != null && query.UniversityIds.Any())
+            {
+                wheres.And(x => query.UniversityIds.Contains(x.UniversityId));
+            }
+
             //此处需加冲稳保
             if (query.AreaId != 821 && query.AreaId != 1047 && query.AreaId != 1965)
             {
@@ -1239,12 +1248,27 @@ namespace New_College.Services
             }
             //根据上述所有筛选  求出招生计划
             var plandesc = await _dal.Query(wheres, "Scoreline desc");
-
+            int universityidcount = 0;
             var start = query.PageSize * (query.PageIndex - 1);
             var end = query.PageIndex * query.PageSize;
-            string ids = string.Join(",", query.UniversityIds);
+
             var stringBuilderinfo = new StringBuilder();
-            stringBuilderinfo.AppendFormat("select Rank,Id,Name,Logo,Nhef,Sff,Syl,Area_Name,AscriptionName from D_University where IsDelete=0 and Id in ({0}) limit {1},{2}", ids, start, end);
+
+            stringBuilderinfo.AppendFormat("select Rank,Id,Name,Logo,Nhef,Sff,Syl,Area_Name,AscriptionName from D_University where IsDelete=0");
+            if (query.UniversityIds != null && query.UniversityIds.Count > 0)
+            {
+                universityidcount = query.UniversityIds.Count;
+                string ids = string.Join(",", query.UniversityIds);
+                stringBuilderinfo.AppendFormat("  and Id in ({0}) ", ids);
+            }
+            else
+            {
+                universityidcount = plandesc.Select(x => x.UniversityId).Distinct().Count();
+                string ids = string.Join(",", plandesc.Select(x => x.UniversityId).Distinct().ToList());
+                stringBuilderinfo.AppendFormat("  and Id in ({0}) ", ids);
+            }
+            stringBuilderinfo.AppendFormat("  limit {0},{1}", start, end);
+
             var sqldata = await d_UniversityRepository.QuerySql(stringBuilderinfo.ToString());
             if (sqldata.Count <= 0)
                 return new MessageModel<PageModel<UniversityEnrollmentPlanResult>>() { success = false, msg = "获取失败，数据为空" };
@@ -1263,7 +1287,7 @@ namespace New_College.Services
                 AscriptionName = item.AscriptionName,
                 MjaorPlan = plandesc.Count(x => x.UniversityId == item.Id),
                 Rank = item.Rank <= 0 ? "-" : item.Rank.ToString(),
-                Type = Type
+                Type = plandesc.Where(x => x.UniversityId == item.Id && x.Scoreline > query.Score + 20).Any() ? "冲" : (plandesc.Where(x => query.Score >= x.Scoreline && query.Score - 25 <= x.Scoreline)).Any() ? "稳" : plandesc.Where(x => x.UniversityId == item.Id && x.Scoreline > 0 && query.Score > x.Scoreline).Any() ? "保" : "其他"
             }).ToList();
             return new MessageModel<PageModel<UniversityEnrollmentPlanResult>>()
             {
@@ -1272,10 +1296,10 @@ namespace New_College.Services
                 response = new PageModel<UniversityEnrollmentPlanResult>()
                 {
                     data = list,
-                    dataCount = query.UniversityIds.Count(),
+                    dataCount = universityidcount,
                     page = query.PageIndex,
                     PageSize = query.PageSize,
-                    pageCount = (int)Math.Ceiling(query.UniversityIds.Count() / Convert.ToDecimal(query.PageSize))
+                    pageCount = (int)Math.Ceiling(universityidcount / Convert.ToDecimal(query.PageSize))
                 }
             };
         }
@@ -1707,6 +1731,7 @@ namespace New_College.Services
                     list.Add(new VolunteerTableResult()
                     {
                         UniversityName = item.UniversityName,
+                       
                         Infos = nowdesc.Select(x => new PlanInfo()
                         {
                             Money = x.Tuitionfee,
@@ -1801,9 +1826,20 @@ namespace New_College.Services
             List<SimuVolunteerTableResult> list = new List<SimuVolunteerTableResult>() { };
             //var planstringids = query.details.Select(x => x.PlanMagorIds).ToList();
             List<int> PlanIds = new List<int>() { };
+            var id = 0;
             foreach (var item in query.details)
             {
+
                 PlanIds.AddRange(item.PlanMagorIds);
+                id = item.PlanMagorIds.First();
+            }
+            string yearName = string.Empty;
+            var plandescmodels = await this.t_EnrollmentPlanedesc.QueryById(id);
+            if (plandescmodels != null)
+            {
+                var planinfo = await this.t_EnrollmentPlaneRepository.QueryById(plandescmodels.PlanId);
+                if (planinfo != null)
+                    yearName = planinfo.Years.ToString();
             }
             var descinfo = await _dal.Query(x => x.IsDelete == false && PlanIds.Contains(x.Id));
             var universityids = query.details.Select(x => x.UniversityId).ToList();
@@ -1842,6 +1878,8 @@ namespace New_College.Services
                         Syl = nowuniversityinfo.Syl > 0,
                         UniversityId = item.UniversityId,
                         UniversityName = item.UniversityName,
+                        Province = nowuniversityinfo.Area_Name,
+                        Nature = nowuniversityinfo.Nature,
                         Infos = nowdesc.Select(x => new PlanInfo()
                         {
                             MajorId = x.Id,
@@ -1849,7 +1887,8 @@ namespace New_College.Services
                             Year = x.Studyyears,
                             PlanName = x.MajorName,
                             PlanNum = x.Plancount,
-                            Scoreline = x.Scoreline
+                            Scoreline = x.Scoreline,
+                            YearName = yearName
                         }).ToList()
                     });
                 }

New_College.Services/Test_PsychMeasurementInfoServices.cs

@@ -14,6 +14,8 @@ using System.Reflection;
 using System;
 using System.Text;
 using New_College.Model;
+using New_College.Model.ViewModels.Result;
+using New_College.Model.ViewModels.Query;
 
 namespace New_College.Services
 {
@@ -1236,6 +1238,53 @@ namespace New_College.Services
             }
         }
 
+        public async Task<List<EvaluationResponse>> GetEvaluations(EvaluationRequest request)
+        {
+            var lists = new List<EvaluationResponse>();
+            var categoryids = new List<int>();
+            categoryids.Add(18);
+            categoryids.Add(19);
+            categoryids.Add(21);
+            var querys = await _dal.Query(e => e.StudentId == request.CustomerId && categoryids.Contains(e.CategoryId));
+
+            lists.Add(new EvaluationResponse()
+            {
+                Title = "Holland"
+            });
+            lists.Add(new EvaluationResponse()
+            {
+                Title = "MBTI"
+            });
+            lists.Add(new EvaluationResponse()
+            {
+                Title = "DISC"
+            });
+            lists.ForEach(a =>
+            {
+                switch (a.Title)
+                {
+                    case "Holland":
+                        var holland = querys.Where(e => e.CategoryId == 18).FirstOrDefault();
+                        a.Message = JsonConvert.DeserializeObject<TagtestingHollandResult>(holland.Result).TagName;
+                        a.PId = holland.Id;
+                        break;
+                    case "MBTI":
+                        var mbti = querys.Where(e => e.CategoryId == 18).FirstOrDefault();
+                        a.Message = mbti.Result;
+                        a.PId = mbti.Id;
+                        break;
+                    case "DISC":
+                        var disc = querys.Where(e => e.CategoryId == 18).FirstOrDefault();
+                        a.Message = "有魅力的、自信的、有说服力的、热情的、鼓舞人心的、乐观的、令人信服的、受欢迎的、好交际的、可信赖的";
+                        a.PId = disc.Id;
+                        break;
+                }
+            });
+            return lists;
+        }
+
+
+
         ///// <summary>                                                                            
         ///// 判断是否为不常见标签，若是则匹配相关联标签
         ///// </summary>