From 872f98768a16e78616531604838c9d735741462a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Tue, 21 Nov 2023 09:23:59 +0800
Subject: [PATCH] =?UTF-8?q?feat=E3=80=8B=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Front/LibraryController.cs    | 18 +++++++
 New_College.Api/New_College.xml               |  8 +++-
 New_College.Api/wwwroot/swg-login.html        |  4 +-
 New_College.IServices/ID_LongIdMapServices.cs |  2 +
 .../ViewModels/Query/UniversityQuery.cs       |  2 +-
 .../ViewModels/Result/uniMajorSecond.cs       | 22 ++++++++-
 .../BASE/D_UniversityRankRepository.cs        |  4 +-
 New_College.Services/D_LongIdMapServices.cs   | 47 +++++++++++++++++--
 .../D_PlanMajorDescServices.cs                |  8 ++--
 9 files changed, 99 insertions(+), 16 deletions(-)

diff --git a/New_College.Api/Controllers/Front/LibraryController.cs b/New_College.Api/Controllers/Front/LibraryController.cs
index ad8f518..084560b 100644
--- a/New_College.Api/Controllers/Front/LibraryController.cs
+++ b/New_College.Api/Controllers/Front/LibraryController.cs
@@ -203,6 +203,24 @@ namespace New_College.Api.Controllers.Front
             };
         }
 
+
+        /// <summary>
+        /// Pc端接口职业库一级二级三级列表
+        /// </summary>
+        /// <returns></returns>
+
+        [HttpGet]
+        public async Task<MessageModel<List<pcMajorInfoResult>>> PcGetOccupationInfo()
+        {
+            var result = await iD_LongIdMapServices.pcGetOccupationInfo();
+            return new MessageModel<List<pcMajorInfoResult>>()
+            {
+                success = result.Count <= 0 ? false : true,
+                msg = result.Count <= 0 ? "获取失败" : "获取成功",
+                response = result
+            };
+        }
+
         /// <summary>
         /// 获取职业第三级
         /// </summary>
diff --git a/New_College.Api/New_College.xml b/New_College.Api/New_College.xml
index 5872cfb..2fd051b 100644
--- a/New_College.Api/New_College.xml
+++ b/New_College.Api/New_College.xml
@@ -335,6 +335,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:New_College.Api.Controllers.Front.LibraryController.PcGetOccupationInfo">
+            <summary>
+            Pc端接口职业库一级二级三级列表
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:New_College.Api.Controllers.Front.LibraryController.GetOccupationThree(New_College.Model.ViewModels.IdQuery)">
             <summary>
             获取职业第三级
@@ -1109,7 +1115,7 @@
             登录管理【无权限】
             </summary>
         </member>
-        <member name="M:New_College.Controllers.LoginController.#ctor(New_College.IServices.ISysUserInfoServices,New_College.IServices.IUserRoleServices,New_College.IServices.IRoleServices,New_College.AuthHelper.PermissionRequirement,New_College.IServices.IRoleModulePermissionServices,Microsoft.AspNetCore.Http.IHttpContextAccessor)">
+        <member name="M:New_College.Controllers.LoginController.#ctor(New_College.IServices.ISysUserInfoServices,New_College.IServices.IUserRoleServices,New_College.IServices.IRoleServices,New_College.AuthHelper.PermissionRequirement,New_College.IServices.IRoleModulePermissionServices)">
             <summary>
             构造函数注入
             </summary>
diff --git a/New_College.Api/wwwroot/swg-login.html b/New_College.Api/wwwroot/swg-login.html
index d361cde..7ada088 100644
--- a/New_College.Api/wwwroot/swg-login.html
+++ b/New_College.Api/wwwroot/swg-login.html
@@ -13,9 +13,9 @@
         <div class="left">
             <div></div>
 
-            <div class="login"><img src="/logo.jpg.jpg" height="30" alt="Alternate Text"/> Blog.Core 接口文档</div>
+            <div class="login"><img src="https://i5.youzy.cn/util4y/media/files/20231026/7840b6f1f30c413eade15babc70be26e_%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20230811154443.png" height="30" alt="Alternate Text"/> 接口文档</div>
             <div class="eula">欢迎使用！</div>
-            <div class="eula">使用真实用户账号登录，测试账号: blogadmin/blogadmin</div>
+            <!--<div class="eula">使用真实用户账号登录，测试账号: blogadmin/blogadmin</div>-->
         </div>
         <div class="right">
             <svg viewBox="0 0 320 300">
diff --git a/New_College.IServices/ID_LongIdMapServices.cs b/New_College.IServices/ID_LongIdMapServices.cs
index fc35474..6d925b3 100644
--- a/New_College.IServices/ID_LongIdMapServices.cs
+++ b/New_College.IServices/ID_LongIdMapServices.cs
@@ -29,6 +29,8 @@ namespace New_College.IServices
 
         Task<List<uniMajorInfoResult>> uniGetOccupationInfo();
 
+        Task<List<pcMajorInfoResult>> pcGetOccupationInfo();
+
         Task<UniversityDetailResponse> GetUniversityDetails(IdQuery query);
 
         
diff --git a/New_College.Model/ViewModels/Query/UniversityQuery.cs b/New_College.Model/ViewModels/Query/UniversityQuery.cs
index abd73dc..a022512 100644
--- a/New_College.Model/ViewModels/Query/UniversityQuery.cs
+++ b/New_College.Model/ViewModels/Query/UniversityQuery.cs
@@ -52,7 +52,7 @@ namespace New_College.Model.ViewModels
         /// <summary>
         /// 院校类型 （0，校友会 1,武书连 2,软科 3,QS 4,U.S.News）
         /// </summary>
-        public int Type { get; set; }
+        public int? Type { get; set; }
 
         /// <summary>
         /// 院校名称
diff --git a/New_College.Model/ViewModels/Result/uniMajorSecond.cs b/New_College.Model/ViewModels/Result/uniMajorSecond.cs
index f2d7b80..a5f7392 100644
--- a/New_College.Model/ViewModels/Result/uniMajorSecond.cs
+++ b/New_College.Model/ViewModels/Result/uniMajorSecond.cs
@@ -1,4 +1,5 @@
-using System;
+using NPOI.POIFS.Storage;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -40,6 +41,25 @@ namespace New_College.Model.ViewModels
         public int SecondId { get; set; }
         public string MajorName { get; set; }
         public int MajorNum { get; set; }
+
+
+    }
+
+    public class pcMajorInfoResult
+    {
+        public int RootId { get; set; }
+        public string Name { get; set; }
+        public List<pcMajorItem> children { get; set; }
+        public int MajorNum { get; set; }
+    }
+
+    public class pcMajorItem
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public int MajorNum { get; set; }
+        public List<pcMajorItem> children { get; set; }
+
     }
 
 
diff --git a/New_College.Repository/BASE/D_UniversityRankRepository.cs b/New_College.Repository/BASE/D_UniversityRankRepository.cs
index e994c66..afb1bc9 100644
--- a/New_College.Repository/BASE/D_UniversityRankRepository.cs
+++ b/New_College.Repository/BASE/D_UniversityRankRepository.cs
@@ -24,8 +24,8 @@ namespace New_College.Repository
         {
 
             var response = await this.Db.Queryable<D_UniversityRank, D_University>((rank, u) => new object[] { JoinType.Left, rank.UniversityName == u.Name })
-          .Where((rank, u) => rank.UniversityType == query.Type)
-           .WhereIF(!string.IsNullOrWhiteSpace(query.Name), (rank, u) => SqlFunc.Contains(rank.UniversityName, query.Name))
+           .Where((rank, u) => rank.UniversityType == query.Type)
+           .WhereIF(!string.IsNullOrWhiteSpace(query.Name), (rank, u) => SqlFunc.Contains(query.Name,rank.UniversityName))
             .WhereIF(query.SubjectType.HasValue, (rank, u) => u.Type == query.SubjectType)
             .OrderBy((rank, u) => rank.Rank, OrderByType.Asc)
             .Select((rank, u) => new UniversityPcRankList
diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs
index 3756051..281f9b5 100644
--- a/New_College.Services/D_LongIdMapServices.cs
+++ b/New_College.Services/D_LongIdMapServices.cs
@@ -280,6 +280,43 @@ namespace New_College.Services
             return list;
         }
 
+
+        public async Task<List<pcMajorInfoResult>> pcGetOccupationInfo()
+        {
+            var list = new List<pcMajorInfoResult>() { };
+            var occupationCategoryList = (await d_OccupationCategoryRepository.Query(x => x.IsDelete == false)).Select(x => new uniOccSelect() { Id = x.Id, Level = x.Level, Name = x.Name, ParentId = x.ParentId, OccupationName = x.OccupationName });
+            var queryoccupations = await d_OccupationRepository.Query(x => x.IsDelete == false);
+            var occupations = queryoccupations.Select(s => s.CategoryId).ToList();
+            var nowoccupationCategoryList = occupationCategoryList.Where(x => x.Level == 0).ToList();
+            foreach (var item in nowoccupationCategoryList)
+            {
+                var scond = new List<pcMajorItem>();
+                var nowmajoclass = occupationCategoryList.Where(x => x.ParentId == item.Id).ToList();
+                scond = nowmajoclass.Select(s => new pcMajorItem()
+                {
+                    Name = s.OccupationName,
+                    MajorNum = occupations.Count(e => e == s.Id),
+                    children = queryoccupations.Where(e => e.CategoryId == s.Id).Select(c => new pcMajorItem()
+                    {
+                        Name = c.Name,
+                        Id = c.Id,
+                        // MajorNum = queryoccupations.Where(e => e.CategoryId == s.Id).Count()
+                    }).ToList(),
+                    Id = s.Id
+                }).ToList();
+                list.Add(new pcMajorInfoResult()
+                {
+                    Name = item.Name,
+                    children = scond
+                });
+            }
+            return list;
+        }
+
+
+
+
+
         /// <summary>
         /// 院校详情
         /// </summary>
@@ -587,10 +624,10 @@ namespace New_College.Services
             //}
             //else
             //{
-                var majorclasses = (await d_MajorClassRepository.Query(x => x.IsDelete == false)).Select(x => new uniMajorClassSelect() { Id = x.Id, Name = x.Name, TradeId = x.TradeId });
-                var nowmajorname = majorclasses.Where(x => x.Id == query.categoryclassid).Select(x => x.Name)?.FirstOrDefault();
-                var newmajorinfo = await d_MajorRepository.Query(x => x.IsDelete == false && x.CategoryClass_Id == query.categoryclassid && x.Type != 3);
-                info = newmajorinfo.Where(x => x.Name != nowmajorname).Select(x => new uniMajorInfo() { Id = x.Id, Name = x.MajorName, Code = x.MajorCode }).ToList();
+            var majorclasses = (await d_MajorClassRepository.Query(x => x.IsDelete == false)).Select(x => new uniMajorClassSelect() { Id = x.Id, Name = x.Name, TradeId = x.TradeId });
+            var nowmajorname = majorclasses.Where(x => x.Id == query.categoryclassid).Select(x => x.Name)?.FirstOrDefault();
+            var newmajorinfo = await d_MajorRepository.Query(x => x.IsDelete == false && x.CategoryClass_Id == query.categoryclassid && x.Type != 3);
+            info = newmajorinfo.Where(x => x.Name != nowmajorname).Select(x => new uniMajorInfo() { Id = x.Id, Name = x.MajorName, Code = x.MajorCode }).ToList();
             //}
             return new MessageModel<List<uniMajorInfo>>()
             {
@@ -1743,7 +1780,7 @@ namespace New_College.Services
             return true;
         }
 
-   
+
 
 
 
diff --git a/New_College.Services/D_PlanMajorDescServices.cs b/New_College.Services/D_PlanMajorDescServices.cs
index ec9be8c..5540fbf 100644
--- a/New_College.Services/D_PlanMajorDescServices.cs
+++ b/New_College.Services/D_PlanMajorDescServices.cs
@@ -41,7 +41,7 @@ namespace New_College.Services
             Expression<Func<D_PlanMajorDesc, bool>> expression = Expressionable.Create<D_PlanMajorDesc>()
                   .And(c => c.IsDelete == false)
                   .And(c => c.Location == request.Location)
-                  .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(request.Major, c.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.Equals(request.BatchName))
                   .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
@@ -63,7 +63,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(request.Major, c.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))
@@ -143,7 +143,7 @@ namespace New_College.Services
             Expression<Func<D_PlanMajorDesc, bool>> expression = Expressionable.Create<D_PlanMajorDesc>()
                   .And(c => c.IsDelete == false)
                   .And(c => c.Location == request.Location)
-                  .AndIF(!string.IsNullOrWhiteSpace(request.Major), c => SqlFunc.Contains(request.Major, c.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.Equals(request.BatchName))
                   .AndIF(!string.IsNullOrWhiteSpace(request.Province), c => SqlFunc.Contains(request.Province, c.AreaName))
@@ -164,7 +164,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(request.Major, c.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))