完善一键填报接口查询功能

New_College.Api/Controllers/Back/D_PlanMajorDescController.cs

@@ -37,7 +37,7 @@ namespace New_College.Api.Controllers
         {
 
             var response = await _d_PlanMajorDescServices.GetPlanMajorList(request);
-            if (!response.data.Any() || response.dataCount <= 0)
+            if (response.data==null||!response.data.Any() || response.dataCount <= 0)
             {
                 return new MessageModel<PageModel<OneSubmitGoResponse>>()
                 {

New_College.Api/New_College.Model.xml

@@ -3667,7 +3667,7 @@
         </member>
         <member name="P:New_College.Model.ViewModels.OneSubmitGoResponse.Type">
             <summary>
-            冲稳保 类型
+            冲稳保 类型:冲2，稳1，保0
             </summary>
         </member>
         <member name="P:New_College.Model.ViewModels.OneSubmitGoResponse.Rank">

New_College.Api/New_College.xml

@@ -113,6 +113,13 @@
             服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
             </summary>
         </member>
+        <member name="M:New_College.Api.Controllers.D_PlanMajorDescController.OneSubmitGo(New_College.Model.ViewModels.OneSubmitGoRequest)">
+            <summary>
+            一键填报
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="F:New_College.Api.Controllers.D_PlanMajorScoreLineController._d_PlanMajorScoreLineServices">
             <summary>
             服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下

New_College.Common/Helper/MajorPlanScoreTool.cs

@@ -0,0 +1,47 @@
+using Org.BouncyCastle.Asn1.Ocsp;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace New_College.Common
+{
+    public class MajorPlanScoreTool
+    {
+        /// <summary>
+        /// 冲稳保计算
+        /// </summary>
+        /// <param name="score"></param>
+        /// <returns></returns>
+        public static int GetPlanScore(int LowScore, int requestScore)
+        {
+            int minscore = requestScore - 15;//最小
+            int constscore = requestScore;//中位数
+            int maxscore = requestScore + 15;//最大
+
+            int type = LowScore <= minscore ? 0 : minscore < LowScore && LowScore <= constscore ? 1 : LowScore > constscore && LowScore <= maxscore ? 2 : -1;
+
+            //if (LowScore <= minscore)
+            //{
+            //    return "保";
+            //}
+            //else if (minscore < LowScore && LowScore <= constscore)
+            //{
+            //    return "稳";
+            //}
+            //else if (LowScore > constscore && LowScore <= maxscore)
+            //{
+
+            //    return "冲";
+
+            //}
+            //else
+            //{
+            //    return "";
+            //}
+
+            return type;
+
+        }
+
+    }
+}

New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs

@@ -94,11 +94,11 @@ namespace New_College.Model.ViewModels
     /// </summary>
     public class OneSubmitGoResponse
     {
-
+        public int LowScoreRank { get; set; }
         /// <summary>
-        /// 冲稳保 类型
+        /// 冲稳保 类型:冲2，稳1，保0
         /// </summary>
-        public string Type { get; set; }
+        public int Type { get; set; }
         /// <summary>
         /// 排名
         /// </summary>

New_College.Services/D_PlanMajorDescServices.cs

@@ -10,6 +10,7 @@ using SqlSugar;
 using System.Linq.Expressions;
 using System;
 using System.Linq;
+using New_College.Common;
 
 namespace New_College.Services
 {
@@ -66,7 +67,7 @@ namespace New_College.Services
                   .AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature)
                  //.AndIF(request. > 0, c => SqlFunc.Between(c.LowScore, request.Score, request.Score)) 位次区间
                  .ToExpression();
-            var query = await _dal.QueryPage(expression, request.PageIndex, request.PageSize, " order by LowScoreRank desc");
+            var query = await _dal.QueryPage(expression, request.PageIndex, request.PageSize, "  LowScoreRank desc ");
 
             var majorarry = query.data.Select(c => c.Major).ToArray();
             var universityarry = query.data.Select(c => c.UniversityName).ToArray();
@@ -116,10 +117,11 @@ namespace New_College.Services
                 UniversityId = c.UId,
                 UniversityName = c.UniversityName,
                 SubjectClam = c.SelectSubject,
-                Type = "冲",//还缺冲稳保
+                Type = MajorPlanScoreTool.GetPlanScore(c.LowScore, request.Score),//还缺冲稳保
                 PlanId = c.Id,
                 UniversityCode = c.EnrollmentCode,
                 MajorCode = c.MajorCode,
+                LowScoreRank = c.LowScoreRank,
                 PlanItems = list.Where(e => e.UniversityName.Equals(c.UniversityName) && e.Major.Equals(c.Major) && e.MajorCode.Equals(c.MajorCode)).Select(s => new PlanItem()
                 {
                     PlanCount = s.PlanCount,
@@ -128,7 +130,7 @@ namespace New_College.Services
                     Year = s.AcademicYear
 
                 }).OrderByDescending(k => k.Year).ToList()
-            }).ToList();
+            }).OrderByDescending(c => c.Type).OrderBy(c => c.LowScoreRank).ToList();
             return new PageModel<OneSubmitGoResponse>()
             {
                 data = responselist,