更新部分细节

New_College.Api/Controllers/Front/NewsInfoController.cs

@@ -109,6 +109,11 @@ namespace New_College.Api.Controllers.Front
                         Summary = !string.IsNullOrWhiteSpace(s.Summary) ? s.Summary : s.Detail.Substring(0, 200) + "...",
                         Title = s.Title
                     }).ToList();
+                    pageresponse.pageCount = pageinfo.data.Count;
+                    pageresponse.page = pageinfo.data.Count;
+                    pageresponse.dataCount = pageinfo.data.Count;
+                    pageresponse.PageSize = pageinfo.PageSize;
+                    pageresponse.pageCount = pageinfo.pageCount;
                 }
                 return new MessageModel<PageModel<NewsInfoResponse>>()
                 {

New_College.Api/Controllers/Front/PcVolunteerController.cs

@@ -13,6 +13,8 @@ using System.Linq.Expressions;
 using New_College.IRepository.UnitOfWork;
 using New_College.Repository.UnitOfWork;
 using SqlSugar;
+using New_College.Common;
+using Microsoft.AspNetCore.Authorization;
 namespace New_College.Api.Controllers.Front
 {
 
@@ -203,8 +205,8 @@ namespace New_College.Api.Controllers.Front
                 var vol = (await _VolunteerTableServices.Query(c => c.CustomerId == request.CustomerId));
                 if (vol.Any())
                 {
-                    request.VolunteerTableName = "我的志愿表" + vol.OrderByDescending(c=>c.CreateTime).FirstOrDefault().OrderSort + 1;
+                    request.VolunteerTableName = "我的志愿表" + (vol.OrderByDescending(c => c.CreateTime).FirstOrDefault().OrderSort + 1);
-                    ordersort = vol.OrderByDescending(c => c.CreateTime).FirstOrDefault().OrderSort + 1;
+                    ordersort = (vol.OrderByDescending(c => c.CreateTime).FirstOrDefault().OrderSort + 1);
                 }
                 else
                 {
@@ -362,6 +364,22 @@ namespace New_College.Api.Controllers.Front
 
 
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="url"></param>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpGet("downloadpdf")]
+        public IActionResult DownloadPdf(string url)
+        {
+            // 假设pdfBytes是已存在的PDF文件字节流
+            byte[] pdfBytes = HelperHtmlConvertPdf.DoHtmlToByte(url);
+            // 设置响应头，指定Content-Type和文件名
+            Response.Headers.Add("Content-Disposition", string.Format("attachment; filename={0}.pdf", DateTime.Now.ToString("MMddHHmmssfff")));
+            Response.ContentType = "application/pdf";
+            return File(pdfBytes, "application/pdf");
+        }
 
 
     }

New_College.Api/New_College.Model.xml

@@ -3995,6 +3995,16 @@
             排名
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.AIGOResponse._fscore">
+            <summary>
+            院校分数线
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGOResponse._frank">
+            <summary>
+            院校位次
+            </summary>
+        </member>
         <member name="P:New_College.Model.ViewModels.AIGOResponse.UniversityCode">
             <summary>
             全国统一招生代码

New_College.Api/New_College.xml

@@ -571,6 +571,13 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="M:New_College.Api.Controllers.Front.PcVolunteerController.DownloadPdf(System.String)">
+            <summary>
+            
+            </summary>
+            <param name="url"></param>
+            <returns></returns>
+        </member>
         <member name="M:New_College.Api.Controllers.Front.RegionController.GetRegionList(New_College.Model.ViewModels.SysRegionQuery)">
             <summary>
             获取省市区

New_College.Common/New_College.Common.csproj

@@ -22,7 +22,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
     <PackageReference Include="NodaTime" Version="3.0.1" />
     <PackageReference Include="NPOI" Version="2.6.0" />
-    <PackageReference Include="RestSharp" Version="106.10.2-alpha.0.8" />
+    <PackageReference Include="PdfSharpCore" Version="1.3.62" />
+    <PackageReference Include="RestSharp" Version="106.15.0" />
     <PackageReference Include="StackExchange.Redis" Version="2.1.30" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.5.0" />
 

New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs

@@ -118,6 +118,23 @@ namespace New_College.Model.ViewModels
 
         public string UniversityName { get; set; }
 
+        public int _fcount { get; set; }
+        public int _scount { get; set; }
+        public int _tcount { get; set; }
+
+        /// <summary>
+        /// 院校分数线
+        /// </summary>
+        public int _fscore { get; set; }
+        public int _sscore { get; set; }
+        public int _tscore { get; set; }
+
+        /// <summary>
+        /// 院校位次
+        /// </summary>
+        public int _frank { get; set; }
+        public int _srank { get; set; }
+        public int _trank { get; set; }
 
         /// <summary>
         /// 全国统一招生代码

New_College.Services/D_PlanMajorDescServices.cs

@@ -109,6 +109,8 @@ namespace New_College.Services
                 UniversityCode = c.RecruitCode.ToString(),
                 LowScoreRank = c.LowScoreRank,
                 Ownership = c.Ownership,
+                //_fscore = c.LowScore,
+                //_frank = c.LowScoreRank,
                 // SubjectClam = c.SelectSubject,
                 Type = MajorPlanScoreTool.GetPlanScore(c.LowScore, request.Score),//冲稳保院校
                 planCount = list.Where(w => w.Years == DateTime.Now.Year && w.UId == c.UId).Sum(c => c.PlanCount),
@@ -131,8 +133,33 @@ namespace New_College.Services
                         Count = "--"
                     }).ToList()
                 }).ToList(),
-
             }).OrderByDescending(c => c.Type).OrderBy(c => c.LowScoreRank).ToList();
+
+            var _qualifcationlist = await _qualificationLineRepository.Query(c => SqlFunc.ContainsArray(universityarry, c.UId));
+            responselist.ForEach(c =>
+            {
+                c._fcount = c.iGoPlanMajorItems.Select(s => s.planCount).Sum();
+                c._scount = c.iGoPlanMajorItems.Select(s => s.PlanItems.Where(w => w.Year == "2022").Sum(s => s.PlanCount)).Sum();
+                c._tcount = c.iGoPlanMajorItems.Select(s => s.PlanItems.Where(w => w.Year == "2021").Sum(s => s.PlanCount)).Sum();
+                if (_qualifcationlist.Where(e => e.Years == DateTime.Now.Year && e.UId == c.UniversityId).Any())
+                {
+                    var tmpqualif = _qualifcationlist.Where(e => e.Years == DateTime.Now.Year && e.UId == c.UniversityId).FirstOrDefault();
+                    c._fscore = tmpqualif.LowScore;
+                    c._frank = tmpqualif.LowScoreRank;
+                };
+                if (_qualifcationlist.Where(e => e.Years == (DateTime.Now.Year - 1) && e.UId == c.UniversityId).Any())
+                {
+                    var tmpqualif = _qualifcationlist.Where(e => e.Years == (DateTime.Now.Year - 1) && e.UId == c.UniversityId).FirstOrDefault();
+                    c._sscore = tmpqualif.LowScore;
+                    c._srank = tmpqualif.LowScoreRank;
+                };
+                if (_qualifcationlist.Where(e => e.Years == (DateTime.Now.Year - 2) && e.UId == c.UniversityId).Any())
+                {
+                    var tmpqualif = _qualifcationlist.Where(e => e.Years == (DateTime.Now.Year - 2) && e.UId == c.UniversityId).FirstOrDefault();
+                    c._tscore = tmpqualif.LowScore;
+                    c._trank = tmpqualif.LowScoreRank;
+                };
+            });
             return new AIGOPageModel<AIGOResponse>()
             {
                 data = responselist,