bug fixed

New_College.Api/Controllers/Front/PcVolunteerController.cs

@@ -271,6 +271,7 @@ namespace New_College.Api.Controllers.Front
                         AcademicYear = a.AcademicYear,
                         Sort = s.OrderSort,
                         MajorSubjectClam = a._23subject,
+                        Percentage = typeinfo.Where(e => e.planId == a.ID).FirstOrDefault().tage.ToString() + "%",
                         _23PlanCount = a._23Count == "0" ? "--" : a._23Count,
                         _22PlanCount = a._22Count == "0" ? "--" : a._22Count,
                         _21PlanCount = a._21Count == "0" ? "--" : a._21Count,
@@ -278,7 +279,7 @@ namespace New_College.Api.Controllers.Front
                         _21Scoreline = a._21Score == "0" ? "--" : a._21Score,
                         _22RankLine = a._22ScoreLine == "0" ? "--" : a._22ScoreLine,
                         _22Scoreline = a._22Score == "0" ? "--" : a._22Score,
-                        _23RankLine = a._23ScoreLine == 0? "--" : a._23ScoreLine.ToString(),
+                        _23RankLine = a._23ScoreLine == 0 ? "--" : a._23ScoreLine.ToString(),
                         _23Scoreline = a._23Score == "0" ? "--" : a._23Score,
                     });
                 });

New_College.Api/New_College.Model.xml

@@ -7971,6 +7971,16 @@
             专业名称
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.Type">
+            <summary>
+            冲稳保
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.Percentage">
+            <summary>
+            录取概率
+            </summary>
+        </member>
         <member name="P:New_College.Model.ViewModels.VolunteerItemsViewMinExcelAttr.MajorSubjectClam">
             <summary>
             专业选科

New_College.Model/ViewModels/VolunteerTableDtoView.cs

@@ -169,6 +169,19 @@ namespace New_College.Model.ViewModels
         [ExcelColumnName("专业名称")]
         public string Major { get; set; }
 
+
+        /// <summary>
+        /// 冲稳保
+        /// </summary>
+        [ExcelColumnName("冲稳保")]
+        public string Type { get; set; }
+
+        /// <summary>
+        /// 录取概率
+        /// </summary>
+        [ExcelColumnName("录取概率")]
+        public string Percentage { get; set; }
+
         ///// <summary>
         ///// 专业备注
         ///// </summary>

New_College.Services/D_PlanMajorDescServices.cs

@@ -198,14 +198,16 @@ namespace New_College.Services
             {
                 request.BatchName = batlist.Where(c => c.Average <= request.Score && c.Batch_name == "本科一批").Any() ? "本科一批" : batlist.Where(c => c.Average <= request.Score && c.Batch_name == "本科二批").Any() ? "本科二批" : "专科批";
             }
+            else if (request.Location == "上海市")
+            {
+                request.BatchName = batlist.Where(c => c.Average <= request.Score && c.Batch_name == "本科").Any() ? "本科" : "专科";
+            }
             else
             {
                 request.BatchName = batlist.Where(c => c.Average <= request.Score && c.Batch_name == "普通类一段").Any() ? "普通类一段" : "普通类二段";
             }
 
-
+            qyear = qyear > 2023 ? 2023 : qyear;
-
-
             Expression<Func<D_QualificationLine, bool>> expression = Expressionable.Create<D_QualificationLine>()
                    .And(c => c.Years == qyear)
                   .And(c => c.IsDelete == false)
@@ -320,6 +322,7 @@ namespace New_College.Services
                 }).ToList();
 
             });
+            //var list = responselist;
             return new AIGOPageModel<AIGOResponse>()
             {
                 data = responselist.Where(e => e.planCount > 0).ToList(),