---bug fix

New_College.Api/New_College.Model.xml

@@ -5229,6 +5229,11 @@
             年份
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.PlanInfo.YearName">
+            <summary>
+            招生年份2021
+            </summary>
+        </member>
         <member name="T:New_College.Model.ViewModels.VolunteerTableListResult">
             <summary>
             志愿列表

New_College.Model/ViewModels/Result/VolunteerTableResult.cs

@@ -35,9 +35,14 @@ namespace New_College.Model.ViewModels
         public string Year { get; set; }
 
         public string Money { get; set; }
+
+        /// <summary>
+        /// 招生年份2021
+        /// </summary>
         public string YearName { get; set; }
 
         public float Scoreline { get; set; }
+
     }
 
     /// <summary>

New_College.Services/T_EnrollmentPlanedescServices.cs

@@ -35,6 +35,7 @@ namespace New_College.Services
         private readonly ID_UniversityCollectionRepository d_UniversityCollectionRepository;
         private readonly IT_GearInfoRepository t_GearInfo;
         private readonly IT_EnrollmentPlanedescRepository t_EnrollmentPlanedesc;
+        private readonly IV_CustomerInfoRepository _CustomerInfoRepository;
         public T_EnrollmentPlanedescServices(IBaseRepository<T_EnrollmentPlanedesc> dal
             , ID_UniversityRepository ID_UniversityRepository
             , IT_EnrollmentBatchRepository IT_EnrollmentBatchRepository
@@ -49,7 +50,7 @@ namespace New_College.Services
             , IU_VolunteerTableRepository IU_VolunteerTableRepository
             , IU_VolunteerTableDetailRepository IU_VolunteerTableDetailRepository
             , ID_UniversityCollectionRepository ID_UniversityCollectionRepository
-            , IT_GearInfoRepository IT_GearInfoRepository, IT_EnrollmentPlanedescRepository t_EnrollmentPlanedescServices)
+            , IT_GearInfoRepository IT_GearInfoRepository, IT_EnrollmentPlanedescRepository t_EnrollmentPlanedescServices, IV_CustomerInfoRepository v_CustomerInfoRepository)
         {
             this._dal = dal;
             d_UniversityRepository = ID_UniversityRepository;
@@ -68,6 +69,7 @@ namespace New_College.Services
             t_GearInfo = IT_GearInfoRepository;
             base.BaseDal = dal;
             this.t_EnrollmentPlanedesc = t_EnrollmentPlanedescServices;
+            this._CustomerInfoRepository = v_CustomerInfoRepository;
         }
 
         public List<string> permut = new List<string>();
@@ -1727,15 +1729,20 @@ namespace New_College.Services
                 }
                 else
                 {
-
+                    string yearname = string.Empty;
+                    if (query.CustomerId.HasValue)
+                    {
+                        yearname = (await this._CustomerInfoRepository.QueryById(query.CustomerId)).Year.ToString();
+                    }
                     list.Add(new VolunteerTableResult()
                     {
                         UniversityName = item.UniversityName,
-                       
+
                         Infos = nowdesc.Select(x => new PlanInfo()
                         {
                             Money = x.Tuitionfee,
                             Year = x.Studyyears == null ? "-" : x.Studyyears == "" ? "-" : x.Studyyears,
+                            YearName = yearname,
                             PlanName = x.MajorName,
                             PlanNum = x.Plancount,
                             Scoreline = x.Scoreline

New_College.Services/Test_PsychMeasurementInfoServices.cs

@@ -16,6 +16,7 @@ using System.Text;
 using New_College.Model;
 using New_College.Model.ViewModels.Result;
 using New_College.Model.ViewModels.Query;
+using Microsoft.Extensions.Logging;
 
 namespace New_College.Services
 {
@@ -30,6 +31,7 @@ namespace New_College.Services
         private readonly IT_EnrollmentPlaneRepository t_EnrollmentPlaneRepository;
         private readonly IT_EnrollmentPlanedescRepository t_EnrollmentPlanedescRepository;
 
+        private readonly ILogger<Test_PsychMeasurementInfoServices> _loggerHelper;
         public Test_PsychMeasurementInfoServices(IBaseRepository<Test_PsychMeasurementInfo> dal
             , ITest_QuestionTypeInfoRepository ITest_QuestionTypeInfoRepository
             , ITest_MBTIMapResultRepository ITest_MBTIMapResultRepository
@@ -37,7 +39,7 @@ namespace New_College.Services
             , IV_SubjectSelectRepository IV_SubjectSelectRepository
             , IT_PlanMapTagRepository IT_PlanMapTagRepository
             , IT_EnrollmentPlaneRepository IT_EnrollmentPlaneRepository
-            , IT_EnrollmentPlanedescRepository IT_EnrollmentPlanedescRepository)
+            , IT_EnrollmentPlanedescRepository IT_EnrollmentPlanedescRepository, ILogger<Test_PsychMeasurementInfoServices> loggerHelper)
         {
             this._dal = dal;
             _QuestionTypeInfoRepository = ITest_QuestionTypeInfoRepository;
@@ -48,6 +50,7 @@ namespace New_College.Services
             t_EnrollmentPlaneRepository = IT_EnrollmentPlaneRepository;
             t_EnrollmentPlanedescRepository = IT_EnrollmentPlanedescRepository;
             base.BaseDal = dal;
+            this._loggerHelper = loggerHelper;
         }
         public List<string> permut = new List<string>();
         /// <summary>
@@ -1259,33 +1262,41 @@ namespace New_College.Services
             {
                 Title = "DISC"
             });
-            lists.ForEach(a =>
+            try
             {
-                switch (a.Title)
+                lists.ForEach(a =>
                 {
-                    case "Holland":
+                    switch (a.Title)
-                        var holland = querys.Where(e => e.CategoryId == 18).FirstOrDefault();
+                    {
-                        a.Message = JsonConvert.DeserializeObject<TagtestingHollandResult>(holland.Result).TagName;
+                        case "Holland":
-                        a.PId = holland.Id;
+                            var holland = querys.Where(e => e.CategoryId == 18).FirstOrDefault();
-                        a.Status = 1;
+                            a.Message = JsonConvert.DeserializeObject<TagtestingHollandResult>(holland.Result).TagName;
-                        break;
+                            a.PId = holland.Id;
-                    case "MBTI":
+                            a.Status = 1;
-                        var mbti = querys.Where(e => e.CategoryId == 19).FirstOrDefault();
+                            break;
-                        a.Message = mbti.Result;
+                        case "MBTI":
-                        a.PId = mbti.Id;
+                            var mbti = querys.Where(e => e.CategoryId == 19).FirstOrDefault();
-                        a.Status = 1;
+                            a.Message = mbti.Result;
-                        break;
+                            a.PId = mbti.Id;
-                    case "DISC":
+                            a.Status = 1;
-                        var disc = querys.Where(e => e.CategoryId == 20);
+                            break;
-                        if (disc.Any())
+                        case "DISC":
-                        {
+                            var disc = querys.Where(e => e.CategoryId == 20);
-                            a.PId = disc.FirstOrDefault().Id;
+                            if (disc.Any())
-                        }
+                            {
-                        a.Message = "有魅力的、自信的、有说服力的、热情的、鼓舞人心的、乐观的、令人信服的、受欢迎的、好交际的、可信赖的";
+                                a.PId = disc.FirstOrDefault().Id;
-                        a.Status = 1;
+                            }
-                        break;
+                            a.Message = "有魅力的、自信的、有说服力的、热情的、鼓舞人心的、乐观的、令人信服的、受欢迎的、好交际的、可信赖的";
-                }
+                            a.Status = 1;
-            });
+                            break;
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                this._loggerHelper.LogError(ex.ToString());
+            }
+
             return lists;
         }
 

New_College.Services/V_CustomerInfoServices.cs

@@ -229,7 +229,9 @@ namespace New_College.Services
                     subjectgroupName = info.subjectgroupName,
                     VipCode = info.VipCode,
                     IsUpdateScore = info.IsUpdateScore,
-                    Year = info.Year
+                    Year = info.Year,
+                    SchoolName = info.SchoolName,
+                    ClassName = info.ClassName
                 }
             };
         }