bug fixed

New_College.Api/New_College.Model.xml

@@ -5825,6 +5825,11 @@
             志愿表详情
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.VolunteerTableResult.EnrollmentCode">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:New_College.Model.ViewModels.VolunteerTableResult.AreaName">
             <summary>
             省市区名称
@@ -5835,11 +5840,51 @@
             年份
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.VolunteerTableResult.Rank">
+            <summary>
+            排名
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.VolunteerTableResult._SYL">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.VolunteerTableResult.Nature">
+            <summary>
+            办学性质
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.VolunteerTableResult.EducationCategory">
+            <summary>
+            学历类别
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.VolunteerTableResult.Ownership">
+            <summary>
+            学校归属
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.PlanInfo.MajorGroup">
+            <summary>
+            专业组
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.PlanInfo.AcademicYear">
+            <summary>
+            学制
+            </summary>
+        </member>
         <member name="P:New_College.Model.ViewModels.PlanInfo.YearName">
             <summary>
             招生年份2021
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.PlanInfo.Remark">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="T:New_College.Model.ViewModels.VolunteerTableListResult">
             <summary>
             志愿列表

New_College.Model/ViewModels/Result/VolunteerTableResult.cs

@@ -11,6 +11,10 @@ namespace New_College.Model.ViewModels
     {
         public int UniversityId { get; set; }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        public string EnrollmentCode { get; set; }
         public string UniversityName { get; set; }
         /// <summary>
         /// 省市区名称
@@ -21,11 +25,53 @@ namespace New_College.Model.ViewModels
         /// </summary>
         public int Year { get; set; }
 
+        /// <summary>
+        /// 排名
+        /// </summary>
+        public string Rank { get; set; }
+
+
+        public string _985 { get; set; }
+
+
+        public string _211 { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string _SYL { get; set; }
+
+
+        /// <summary>
+        /// 办学性质
+        /// </summary>
+        public string Nature { get; set; }
+
+        /// <summary>
+        /// 学历类别
+        /// </summary>
+        public string EducationCategory { get; set; }
+
+
+
+
+        /// <summary>
+        /// 学校归属
+        /// </summary>
+        public string Ownership { get; set; }
+
+
         public List<PlanInfo> Infos { get; set; }
     }
 
     public class PlanInfo
     {
+
+        /// <summary>
+        /// 专业组
+        /// </summary>
+        public string MajorGroup { get; set; }
+        public string MajorCode { get; set; }
         public int MajorId { get; set; }
 
         public string PlanName { get; set; }
@@ -36,12 +82,24 @@ namespace New_College.Model.ViewModels
 
         public string Money { get; set; }
 
+        /// <summary>
+        /// 学制
+        /// </summary>
+        public string AcademicYear { get; set; }
+
         /// <summary>
         /// 招生年份2021
         /// </summary>
         public string YearName { get; set; }
 
-        public float Scoreline { get; set; }
+        public string Scoreline { get; set; }
+
+        public  string LowScoreRank { get; set; }
+
+       /// <summary>
+       /// 
+       /// </summary>
+        public string Remark { get; set; }
 
     }
 

New_College.Services/T_EnrollmentPlanedescServices.cs

@@ -559,7 +559,8 @@ namespace New_College.Services
                         YearName = query.Year.ToString(),
                         PlanName = x.Major,
                         PlanNum = x.PlanCount,
-                        Scoreline = x.LowScore
+                        Scoreline = x.LowScore == 0 ? "-" : x.LowScore.ToString(),
+                        LowScoreRank = x.LowScoreRank == 0 ? "-" : x.LowScoreRank.ToString()
                     }).ToList(),
                     //  AscriptionName = item.AscriptionName,
                     // Rank = item.Rank <= 0 ? "-" : item.Rank.ToString()
@@ -1067,42 +1068,35 @@ namespace New_College.Services
                     var nowdesc = descinfo.Where(x => planids.Contains(x.Id)).ToList();
                     if (nowdesc.Count <= 0)
                         continue;
-                    //此处处理针对于霍兰德推荐的具有相同学校的案例
+                    string yearname = string.Empty;
-                    var count = list.Where(x => x.UniversityName == item.UniversityName).ToList();
+                    if (query.CustomerId.HasValue)
-                    if (count.Count > 0)
                     {
-                        var newinfos = nowdesc.Select(x => new PlanInfo()
+                        yearname = (await this._CustomerInfoRepository.QueryById(query.CustomerId)).Year.ToString();
+                    }
+                    list.Add(new VolunteerTableResult()
+                    {
+                        UniversityName = item.UniversityName,
+                        EnrollmentCode = nowdesc.FirstOrDefault(o => o.UId == item.UniversityId).EnrollmentCode,
+                        Nature = nowdesc.FirstOrDefault(o => o.UId == item.UniversityId).Nature,
+                        Ownership = nowdesc.FirstOrDefault(o => o.UId == item.UniversityId).Ownership,
+                        _211 = nowdesc.FirstOrDefault(o => o.UId == item.UniversityId)._211,
+                        _985 = nowdesc.FirstOrDefault(o => o.UId == item.UniversityId)._985,
+                        _SYL = nowdesc.FirstOrDefault(o => o.UId == item.UniversityId)._SYL,
+                        Infos = nowdesc.Select(x => new PlanInfo()
                         {
                             Money = x.Free,
                             Year = x.Years == 0 ? "-" : x.Years.ToString() == "" ? "-" : x.Years.ToString(),
                             PlanName = x.Major,
+                            MajorCode = descinfo.FirstOrDefault(o => o.Id == x.Id).MajorCode,
+                            MajorGroup = descinfo.FirstOrDefault(o => o.Id == x.Id).MajorGroup,
                             PlanNum = x.PlanCount,
-                            Scoreline = x.LowScore
+                            YearName = (x.Years - 1).ToString(),
-                        }).ToList();
+                            Scoreline = x.LowScore == 0 ? "-" : x.LowScore.ToString(),
-                        count.FirstOrDefault().Infos.AddRange(newinfos);
+                            LowScoreRank = x.LowScoreRank == 0 ? "-" : x.LowScoreRank.ToString(),
-
+                            Remark = x.Remark,
-                    }
+                            AcademicYear = x.AcademicYear
-                    else
+                        }).ToList()
-                    {
+                    });
-                        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.Free,
-                                Year = x.Years == 0 ? "-" : x.Years.ToString() == "" ? "-" : x.Years.ToString(),
-                                PlanName = x.Major,
-                                PlanNum = x.PlanCount,
-                                Scoreline = x.LowScore
-                            }).ToList()
-                        });
-                    }
                 }
 
             }
@@ -1234,7 +1228,8 @@ namespace New_College.Services
                             Year = x.AcademicYear,
                             PlanName = x.Major,
                             PlanNum = x.PlanCount,
-                            Scoreline = x.LowScore
+                            Scoreline = x.LowScore == 0 ? "-" : x.LowScore.ToString(),
+                            LowScoreRank = x.LowScoreRank == 0 ? "-" : x.LowScoreRank.ToString()
                         }).ToList();
                         count.FirstOrDefault().Infos.AddRange(newinfos);
                     }
@@ -1258,7 +1253,8 @@ namespace New_College.Services
                                 Year = x.AcademicYear,
                                 PlanName = x.Major,
                                 PlanNum = x.PlanCount,
-                                Scoreline = x.LowScore,
+                                Scoreline = x.LowScore == 0 ? "-" : x.LowScore.ToString(),
+                                LowScoreRank = x.LowScoreRank == 0 ? "-" : x.LowScoreRank.ToString(),
                                 YearName = yearName
                             }).ToList()
                         });
@@ -1316,7 +1312,8 @@ namespace New_College.Services
                             Year = x.Studyyears,
                             PlanName = x.MajorName,
                             PlanNum = x.Plancount,
-                            Scoreline = x.Scoreline
+                            Scoreline = x.Scoreline == 0 ? "-" : x.Scoreline.ToString(),
+                            LowScoreRank = x.scorepostion == 0 ? "-" : x.scorepostion.ToString()
                         }).ToList();
                         count.FirstOrDefault().Infos.AddRange(newinfos);
                     }
@@ -1338,7 +1335,7 @@ namespace New_College.Services
                                 Year = x.Studyyears,
                                 PlanName = x.MajorName,
                                 PlanNum = x.Plancount,
-                                Scoreline = x.Scoreline
+                                Scoreline = x.Scoreline == 0 ? "-" : x.Scoreline.ToString()
                             }).ToList()
                         });
                     }