AI智能填报模块 逻辑更新

New_College.Api/Controllers/Back/D_PlanMajorDescController.cs

@@ -53,7 +53,7 @@ namespace New_College.Api.Controllers
                 };
             }
 
-            if (!string.IsNullOrWhiteSpace(request.SubjectClaim))
+            if (string.IsNullOrWhiteSpace(request.SubjectClaim))
             {
                 return new MessageModel<PageModel<OneSubmitGoResponse>>()
                 {
@@ -62,7 +62,7 @@ namespace New_College.Api.Controllers
                 };
             }
 
-            if (!string.IsNullOrWhiteSpace(request.BatchName))
+            if (string.IsNullOrWhiteSpace(request.BatchName))
             {
                 return new MessageModel<PageModel<OneSubmitGoResponse>>()
                 {
@@ -100,12 +100,12 @@ namespace New_College.Api.Controllers
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<MessageModel<PageModel<OneSubmitGoResponse>>> AIGo([FromQuery] OneSubmitGoRequest request)
+        public async Task<MessageModel<AIGOPageModel<AIGOResponse>>> AIGo([FromQuery] OneSubmitGoRequest request)
         {
 
             if (string.IsNullOrWhiteSpace(request.Location))
             {
-                return new MessageModel<PageModel<OneSubmitGoResponse>>()
+                return new MessageModel<AIGOPageModel<AIGOResponse>>()
                 {
                     msg = "Location字段必传参数",
 
@@ -113,25 +113,25 @@ namespace New_College.Api.Controllers
             }
             if (request.Year <= 0)
             {
-                return new MessageModel<PageModel<OneSubmitGoResponse>>()
+                return new MessageModel<AIGOPageModel<AIGOResponse>>()
                 {
                     msg = "Year字段必传参数",
 
                 };
             }
 
-            if (!string.IsNullOrWhiteSpace(request.SubjectClaim))
+            if (string.IsNullOrWhiteSpace(request.SubjectClaim))
             {
-                return new MessageModel<PageModel<OneSubmitGoResponse>>()
+                return new MessageModel<AIGOPageModel<AIGOResponse>>()
                 {
                     msg = "SubjectClaim字段必传参数",
 
                 };
             }
 
-            if (!string.IsNullOrWhiteSpace(request.BatchName))
+            if (string.IsNullOrWhiteSpace(request.BatchName))
             {
-                return new MessageModel<PageModel<OneSubmitGoResponse>>()
+                return new MessageModel<AIGOPageModel<AIGOResponse>>()
                 {
                     msg = "BatchName字段必传参数",
 
@@ -142,7 +142,7 @@ namespace New_College.Api.Controllers
             var response = await _d_PlanMajorDescServices.GetAIGoList(request);
             if (response.data == null || !response.data.Any() || response.dataCount <= 0)
             {
-                return new MessageModel<PageModel<OneSubmitGoResponse>>()
+                return new MessageModel<AIGOPageModel<AIGOResponse>>()
                 {
                     msg = "获取失败",
                     success = false,
@@ -150,7 +150,7 @@ namespace New_College.Api.Controllers
                 };
             }
 
-            return new MessageModel<PageModel<OneSubmitGoResponse>>()
+            return new MessageModel<AIGOPageModel<AIGOResponse>>()
             {
                 msg = "获取成功",
                 success = true,

New_College.Api/Controllers/Front/CustomerController.cs

@@ -211,7 +211,7 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<MessageModel<CustomerInfoResult>> UpdateCustomer(CustomerUpdateQuery query)
+        public async Task<MessageModel<CustomerInfoResult>> UpdateCustomer([FromBody]CustomerUpdateQuery query)
         {
             var result = await _services.UpdateCustomer(query);
             if (result.Id > 0)

New_College.Api/New_College.Model.xml

@@ -766,6 +766,21 @@
             学校
             </summary>
         </member>
+        <member name="P:New_College.Model.Models.D_QualificationLine.Ownership">
+             <summary>
+            学校归属：教育部，上海市-湖北省
+             </summary>
+        </member>
+        <member name="P:New_College.Model.Models.D_QualificationLine.AreaName">
+            <summary>
+            院校所在省份
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.D_QualificationLine._SYL">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:New_College.Model.Models.D_QualificationLine.Rank">
             <summary>
             软科排名
@@ -801,6 +816,11 @@
             招生代码
             </summary>
         </member>
+        <member name="P:New_College.Model.Models.D_QualificationLine.Nature">
+            <summary>
+            办学性质:公办 民办
+            </summary>
+        </member>
         <member name="P:New_College.Model.Models.D_QualificationLine.RecruitType">
             <summary>
             招生类型
@@ -2784,6 +2804,46 @@
             返回数据
             </summary>
         </member>
+        <member name="P:New_College.Model.AIGOPageModel`1.c">
+            <summary>
+            冲
+            </summary>
+        </member>
+        <member name="P:New_College.Model.AIGOPageModel`1.w">
+            <summary>
+            稳
+            </summary>
+        </member>
+        <member name="P:New_College.Model.AIGOPageModel`1.b">
+            <summary>
+            保
+            </summary>
+        </member>
+        <member name="P:New_College.Model.AIGOPageModel`1.page">
+            <summary>
+            当前页标
+            </summary>
+        </member>
+        <member name="P:New_College.Model.AIGOPageModel`1.pageCount">
+            <summary>
+            总页数
+            </summary>
+        </member>
+        <member name="P:New_College.Model.AIGOPageModel`1.dataCount">
+            <summary>
+            数据总数
+            </summary>
+        </member>
+        <member name="P:New_College.Model.AIGOPageModel`1.PageSize">
+            <summary>
+            每页大小
+            </summary>
+        </member>
+        <member name="P:New_College.Model.AIGOPageModel`1.data">
+            <summary>
+            返回数据
+            </summary>
+        </member>
         <member name="P:New_College.Model.Request.DecryptUserInfoRequest.avatarUrl">
             <summary>
             用户头像
@@ -3750,6 +3810,81 @@
             学校归属：教育部，上海市-湖北省
              </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.AIGOResponse.Type">
+            <summary>
+            冲稳保 类型:冲2，稳1，保0
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGOResponse.Rank">
+            <summary>
+            排名
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGOResponse.UniversityCode">
+            <summary>
+            全国统一招生代码
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGOResponse._SYL">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGOResponse.planCount">
+            <summary>
+            计划数
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGOResponse.iGoPlanMajorItems">
+            <summary>
+            AIGO
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGoPlanMajorItem.planCount">
+            <summary>
+            计划数
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGoPlanMajorItem.fee">
+            <summary>
+            学费
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGoPlanMajorItem.MajorCode">
+            <summary>
+            专业代码
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGoPlanMajorItem.MajorGroup">
+            <summary>
+            专业组
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGoPlanMajorItem.Major">
+            <summary>
+            专业名称
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGoPlanMajorItem.MajorRemark">
+            <summary>
+            专业备注
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGoPlanMajorItem.SubjectClam">
+            <summary>
+            选科组合
+            </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGoPlanMajorItem.PlanItems">
+             <summary>
+            
+             </summary>
+        </member>
+        <member name="P:New_College.Model.ViewModels.AIGoPlanMajorItem.PlanId">
+            <summary>
+            招生计划Id
+            </summary>
+        </member>
         <member name="T:New_College.Model.ViewModels.OneSubmitGoResponse">
             <summary>
             一键填报返回值

New_College.Api/Properties/launchSettings.json

@@ -14,8 +14,8 @@
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
+      }
-      "applicationUrl": "http://localhost:8083"
+  
     },
     "IIS Express": {
       "commandName": "IISExpress",

New_College.Api/Startup.cs

@@ -139,7 +139,7 @@ namespace New_College
                 //允许额外符号
                 options.JsonSerializerOptions.AllowTrailingCommas = true;
                 //反序列化过程中属性名称是否使用不区分大小写的比较
-                options.JsonSerializerOptions.PropertyNameCaseInsensitive = false;
+             //   options.JsonSerializerOptions.PropertyNameCaseInsensitive = false;
 
                 ////忽略循环引用
                 //options.JsonSerializerOptions.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;

New_College.Api/appsettings.json

@@ -26,7 +26,7 @@
       "Name": "New_College"
     }
   },
-  "urls": "http://*:8082", // IIS 部署，注释掉
+  "urls": "http://*:8083", // IIS 部署，注释掉
   "AllowedHosts": "*",
   "AppSettings": {
     "RedisCachingAOP": {

New_College.IServices/ID_PlanMajorDescServices.cs

@@ -26,6 +26,6 @@ namespace New_College.IServices
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        Task<PageModel<OneSubmitGoResponse>> GetAIGoList(OneSubmitGoRequest request);
+        Task<AIGOPageModel<AIGOResponse>> GetAIGoList(OneSubmitGoRequest request);
     }
 }

New_College.Model/Models/D_QualificationLine.cs

@@ -28,6 +28,28 @@ namespace New_College.Model.Models
         /// </summary>
         public string UniversityName { get; set; }
 
+        /// <summary>
+        ///学校归属：教育部，上海市-湖北省
+        /// </summary>
+        public string Ownership { get; set; }
+
+  
+        /// <summary>
+        /// 院校所在省份
+        /// </summary>
+        public string AreaName { get; set; }
+
+
+        public string _985 { get; set; }
+
+
+        public string _211 { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string _SYL { get; set; }
+
 
         /// <summary>
         /// 软科排名
@@ -66,6 +88,10 @@ namespace New_College.Model.Models
         public int RecruitCode { get; set; }
 
 
+        /// <summary>
+        /// 办学性质:公办 民办
+        /// </summary>
+        public string Nature { get; set; }
         /// <summary>
         /// 招生类型
         /// </summary>

New_College.Model/PageModel.cs

@@ -30,4 +30,46 @@ namespace New_College.Model
 
     }
 
+
+    public class AIGOPageModel<T>
+    {
+
+        /// <summary>
+        /// 冲
+        /// </summary>
+        public int c { get; set; }
+
+        /// <summary>
+        /// 稳
+        /// </summary>
+        public int w { get; set; }
+
+        /// <summary>
+        /// 保
+        /// </summary>
+        public int b { get; set; }
+        /// <summary>
+        /// 当前页标
+        /// </summary>
+        public int page { get; set; } = 1;
+        /// <summary>
+        /// 总页数
+        /// </summary>
+        public int pageCount { get; set; } = 6;
+        /// <summary>
+        /// 数据总数
+        /// </summary>
+        public int dataCount { get; set; } = 0;
+        /// <summary>
+        /// 每页大小
+        /// </summary>
+        public int PageSize { set; get; }
+        /// <summary>
+        /// 返回数据
+        /// </summary>
+        public List<T> data { get; set; }
+
+    }
+
+
 }

New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs

@@ -102,6 +102,101 @@ namespace New_College.Model.ViewModels
     }
 
 
+    public class AIGOResponse
+    {
+        public int LowScoreRank { get; set; }
+        /// <summary>
+        /// 冲稳保 类型:冲2，稳1，保0
+        /// </summary>
+        public int Type { get; set; }
+        /// <summary>
+        /// 排名
+        /// </summary>
+        public string Rank { get; set; }
+
+        public int UniversityId { get; set; }
+
+        public string UniversityName { get; set; }
+
+
+        /// <summary>
+        /// 全国统一招生代码
+        /// </summary>
+        public string UniversityCode { get; set; }
+
+        public string AreaName { get; set; }
+
+        public string _985 { get; set; }
+
+
+        public string _211 { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string _SYL { get; set; }
+
+        /// <summary>
+        /// 计划数
+        /// </summary>
+        public int planCount { get; set; }
+
+        /// <summary>
+        /// AIGO
+        /// </summary>
+        public List<AIGoPlanMajorItem> iGoPlanMajorItems { get; set; }
+
+    }
+
+
+    public class AIGoPlanMajorItem
+    {
+       
+        /// <summary>
+        /// 计划数
+        /// </summary>
+        public int planCount { get; set; }
+
+        /// <summary>
+        /// 学费
+        /// </summary>
+        public string fee { get; set; }
+
+
+        /// <summary>
+        /// 专业代码
+        /// </summary>
+        public string MajorCode { get; set; }
+        /// <summary>
+        /// 专业组
+        /// </summary>
+        public string MajorGroup { get; set; }
+        /// <summary>
+        /// 专业名称
+        /// </summary>
+        public string Major { get; set; }
+
+        /// <summary>
+        /// 专业备注
+        /// </summary>
+        public string MajorRemark { get; set; }
+
+        /// <summary>
+        /// 选科组合
+        /// </summary>
+        public string SubjectClam { get; set; }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public List<PlanItem> PlanItems { get; set; }
+
+        /// <summary>
+        /// 招生计划Id
+        /// </summary>
+        public int PlanId { get; set; }
+    }
+
 
     /// <summary>
     /// 一键填报返回值
@@ -202,4 +297,9 @@ namespace New_College.Model.ViewModels
         public int Scoreline { get; set; }
     }
 
+
+
+
+
+
 }

New_College.Services/D_PlanMajorDescServices.cs

@@ -11,6 +11,7 @@ using System.Linq.Expressions;
 using System;
 using System.Linq;
 using New_College.Common;
+using New_College.IRepository;
 
 namespace New_College.Services
 {
@@ -21,10 +22,12 @@ namespace New_College.Services
     public class D_PlanMajorDescServices : BaseServices<D_PlanMajorDesc>, ID_PlanMajorDescServices
     {
         private readonly IBaseRepository<D_PlanMajorDesc> _dal;
-        public D_PlanMajorDescServices(IBaseRepository<D_PlanMajorDesc> dal)
+        private readonly ID_QualificationLineRepository _qualificationLineRepository;
+        public D_PlanMajorDescServices(IBaseRepository<D_PlanMajorDesc> dal, ID_QualificationLineRepository d_QualificationLineRepository)
         {
             this._dal = dal;
             base.BaseDal = dal;
+            _qualificationLineRepository = d_QualificationLineRepository;
         }
 
 
@@ -33,20 +36,19 @@ namespace New_College.Services
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public async Task<PageModel<OneSubmitGoResponse>> GetAIGoList(OneSubmitGoRequest request)
+        public async Task<AIGOPageModel<AIGOResponse>> GetAIGoList(OneSubmitGoRequest request)
         {
-            var pagemodel = new PageModel<OneSubmitGoResponse>();
+            var pagemodel = new AIGOPageModel<AIGOResponse>();
             int startscore = request.Score - 15;
             int endscore = request.Score + 15;
-            Expression<Func<D_PlanMajorDesc, bool>> expression = Expressionable.Create<D_PlanMajorDesc>()
+            int qyear = request.Year >= DateTime.Now.Year ? DateTime.Now.Year - 1 : 2022;
+            Expression<Func<D_QualificationLine, bool>> expression = Expressionable.Create<D_QualificationLine>()
+                  .And(c => c.Years == qyear)
                   .And(c => c.IsDelete == false)
                   .And(c => c.Location == request.Location)
-                  .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.Major,request.Major))
-                  .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(request.SubjectClaim, c.SelectSubject))
                   .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName.Equals(request.BatchName))
-                  .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
+                 .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
-                  .And(c => c.Years == request.Year)
+                  .AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SubjectType == request.SchoolType)
-                  .AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SchoolType == request.SchoolType)
                   .AndIF(request.Score > 0 && (request.EndScore <= endscore && request.StartScore >= startscore), c => SqlFunc.Between(c.LowScore, startscore, endscore))
                   .AndIF(request.EndScore > endscore || request.StartScore < startscore, c => SqlFunc.Between(c.LowScore, request.StartScore, request.EndScore))
                   .AndIF(request.Syl.HasValue && request.Syl == 1, c => c._SYL == "是")
@@ -54,18 +56,17 @@ namespace New_College.Services
                   .AndIF(request._985.HasValue && request._985 == 1, c => c._985 == "是")
                   .AndIF(!string.IsNullOrWhiteSpace(request.Ownership), c => c.Ownership == request.Ownership)
                   .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, "  LowScoreRank desc ");
+            var query = await _qualificationLineRepository.QueryPage(expression, request.PageIndex, request.PageSize, "  LowScoreRank desc ");
 
-            var majorarry = query.data.Select(c => c.Major).Distinct().ToArray();
+            //var majorarry = query.data.Select(c => c.Major).Distinct().ToArray();
             var universityarry = query.data.Select(c => c.UId).Distinct().ToArray();//
             Expression<Func<D_PlanMajorDesc, bool>> expression2 = Expressionable.Create<D_PlanMajorDesc>()
                   .And(c => c.IsDelete == false)
                   .And(c => c.Location == request.Location)
                   .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.Major, request.Major))
-                  // .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(request.SubjectClaim, c.SelectSubject)) //此条件不带
+                  .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(c.SelectSubject, request.SubjectClaim)) //此条件不带
-                  .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName.Trim())
+                  .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName)
                   .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
                   .AndIF(!string.IsNullOrWhiteSpace(request.SchoolType), c => c.SchoolType == request.SchoolType)
                   .AndIF(request.Syl.HasValue && request.Syl == 1, c => c._SYL == "是")
@@ -73,9 +74,9 @@ namespace New_College.Services
                   .AndIF(request._985.HasValue && request._985 == 1, c => c._985 == "是")
                   .AndIF(!string.IsNullOrWhiteSpace(request.Ownership), c => c.Ownership == request.Ownership)
                   .AndIF(!string.IsNullOrWhiteSpace(request.Nature), c => c.Nature == request.Nature)
-                   .AndIF(majorarry.Any(), c => SqlFunc.ContainsArray(majorarry, c.Major))
+                  //.AndIF(majorarry.Any(), c => SqlFunc.ContainsArray(majorarry, c.Major))
                   .AndIF(universityarry.Any(), c => SqlFunc.ContainsArray(universityarry, c.UId))
-                 //.AndIF(request. > 0, c => SqlFunc.Between(c.LowScore, request.Score, request.Score)) 位次区间
+                  .AndIF(request.EndScore > endscore || request.StartScore < startscore, c => SqlFunc.Between(c.LowScore, request.StartScore, request.EndScore))
                  .ToExpression();
             var list = (await _dal.Query(expression2)).Select(c => new D_PlanMajorDesc()
             {
@@ -87,41 +88,49 @@ namespace New_College.Services
                 LowScore = c.LowScore,
                 LowScoreRank = c.LowScoreRank,
                 PlanCount = c.PlanCount,
+                Id = c.Id
                 // AcademicYear = c.Years.ToString()
-
             }).ToList();
-            var responselist = query.data.Select(c => new OneSubmitGoResponse()
+            var responselist = query.data.Select(c => new AIGOResponse()
             {
                 AreaName = c.AreaName,
-                fee = c.Free,
+                Rank = c.Rank.ToString(),
-                Major = c.Major,
-                MajorGroup = c.MajorGroup,
-                MajorRemark = c.Remark,
-                planCount = c.PlanCount,
-                Rank = c.Rank,
                 _985 = c._985,
                 _211 = c._211,
                 _SYL = c._SYL,
                 UniversityId = c.UId,
                 UniversityName = c.UniversityName,
-                SubjectClam = c.SelectSubject,
+                UniversityCode = c.RecruitCode.ToString(),
-                Type = MajorPlanScoreTool.GetPlanScore(c.LowScore, request.Score),//还缺冲稳保
-                PlanId = c.Id,
-                UniversityCode = c.EnrollmentCode,
-                MajorCode = c.MajorCode,
                 LowScoreRank = c.LowScoreRank,
-                PlanItems = list.Where(e => e.UId == c.UId && e.Major.Equals(c.Major)).Select(s => new PlanItem()
+                // 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),
+                iGoPlanMajorItems = list.Where(w => w.Years == DateTime.Now.Year && w.UId == c.UId).Select(t => new AIGoPlanMajorItem()
                 {
-                    PlanCount = s.PlanCount,
+                    PlanId = t.Id,
-                    RankLine = s.LowScoreRank,
+                    MajorCode = t.MajorCode,
-                    Scoreline = s.LowScore,
+                    fee = t.Free,
-                    Year = s.Years.ToString()
+                    Major = t.Major,
+                    MajorGroup = t.MajorGroup,
+                    MajorRemark = t.Remark,
+                    planCount = t.PlanCount,
+                    SubjectClam = t.SelectSubject,
+                    PlanItems = list.Where(ss => ss.UId == c.UId && ss.Major == t.Major).Select(k => new PlanItem()
+                    {
+                        PlanCount = k.PlanCount,
+                        RankLine = k.LowScoreRank,
+                        Scoreline = k.LowScoreRank,
+                        Year = k.Years.ToString()
+                    }).ToList()
+                }).ToList(),
 
-                }).OrderByDescending(k => k.Year).ToList()
             }).OrderByDescending(c => c.Type).OrderBy(c => c.LowScoreRank).ToList();
-            return new PageModel<OneSubmitGoResponse>()
+            return new AIGOPageModel<AIGOResponse>()
             {
                 data = responselist,
+                c = responselist.Select(c => c.Type == 2).Count(),
+                w = responselist.Select(c => c.Type == 1).Count(),
+                b = responselist.Select(c => c.Type == 0).Count(),
                 dataCount = query.dataCount,
                 page = query.page,
                 pageCount = query.pageCount,
@@ -164,7 +173,7 @@ namespace New_College.Services
             Expression<Func<D_PlanMajorDesc, bool>> expression2 = Expressionable.Create<D_PlanMajorDesc>()
                   .And(c => c.IsDelete == false)
                   .And(c => c.Location == request.Location)
-                  .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.Major,request.Major))
+                  .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(c.Major, request.Major))
                   // .AndIF(!string.IsNullOrWhiteSpace(request.SubjectClaim), c => SqlFunc.Contains(request.SubjectClaim, c.SelectSubject)) //此条件不带
                   .AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName.Trim())
                   .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))