feat:小程序职业模块调整

New_College.Api/Controllers/Front/LibraryController.cs

@@ -193,9 +193,9 @@ namespace New_College.Api.Controllers.Front
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<MessageModel<List<uniMajorInfoResult>>> uniGetOccupationInfo()
+        public async Task<MessageModel<List<uniMajorInfoResult>>> uniGetOccupationInfo([FromQuery] MinOccupationRequest request)
         {
-            var result = await iD_LongIdMapServices.uniGetOccupationInfo();
+            var result = await iD_LongIdMapServices.uniGetOccupationInfo(request);
             return new MessageModel<List<uniMajorInfoResult>>()
             {
                 success = result.Count <= 0 ? false : true,
@@ -214,14 +214,6 @@ namespace New_College.Api.Controllers.Front
         public async Task<MessageModel<dynamic>> PcGetOccupationInfo()
         {
             ////http://192.168.104.104:3000/youzy.dms.basiclib.api.v1.career2.level.tree.get
-            //var info = HttpHelper.GetApi<pcOccupationobject>("http://192.168.104.104:3000/", "youzy.dms.basiclib.api.v1.career2.level.tree.get");
-            //return new MessageModel<dynamic>()
-            //{
-            //    msg = "获取成功",
-            //    response = info,
-            //    status = 200,
-            //    success = true,
-            //};
             var result = await iD_LongIdMapServices.pcGetOccupationInfo();
             return new MessageModel<dynamic>()
             {

New_College.Api/Controllers/Front/OccupationMapJobInfoController.cs

@@ -0,0 +1,59 @@
+using New_College.IServices;
+using New_College.Model;
+using New_College.Model.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using SqlSugar;
+
+namespace New_College.Api.Controllers
+{
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    [Authorize]
+    public class MapJobInfoController : ControllerBase
+    {
+        /// <summary>
+        /// 服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
+        /// </summary>
+        private readonly IOccupationMapJobInfoServices _occupationMapJobInfoServices;
+
+        public MapJobInfoController(IOccupationMapJobInfoServices OccupationMapJobInfoServices)
+        {
+            _occupationMapJobInfoServices = OccupationMapJobInfoServices;
+        }
+
+
+
+        /// <summary>
+        /// 根据职业名称查询岗位信息列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<MessageModel<PageModel<OccupationMapJobInfo>>> Get([FromQuery] OccupationMapJobInfoRequest request)
+        {
+
+            if (string.IsNullOrWhiteSpace(request.OccupName))
+            {
+                return new MessageModel<PageModel<OccupationMapJobInfo>>()
+                {
+                    msg = "Occupname必填",
+                    success = false,
+                    status = 200
+                };
+            }
+            request.OccupName = "后端开发";
+            var query = await _occupationMapJobInfoServices.QueryPage(c => SqlFunc.Contains(c.occupName, request.OccupName), request.PageIndex, request.PageSize);
+            return new MessageModel<PageModel<OccupationMapJobInfo>>()
+            {
+                msg = "获取成功",
+                success = true,
+                response = query
+            };
+        }
+
+    }
+}

New_College.Api/New_College.Model.xml

@@ -515,6 +515,31 @@
             职业介绍
             </summary>
         </member>
+        <member name="P:New_College.Model.Models.D_Occupation.JobContent">
+            <summary>
+            工作内容
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.D_Occupation.Prospects">
+            <summary>
+            发展前景
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.D_Occupation.Requirements">
+            <summary>
+            岗位要求
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.D_Occupation.PersonProspects">
+            <summary>
+            个人发展
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.D_Occupation.OccuptionTrend">
+            <summary>
+            职业就业趋势
+            </summary>
+        </member>
         <member name="P:New_College.Model.Models.D_Occupation.Recommend">
             <summary>
             是否推荐，0为不推荐，1为推荐
@@ -1501,6 +1526,61 @@
             素材内容
             </summary>
         </member>
+        <member name="P:New_College.Model.Models.OccupationMapJobInfo.source">
+            <summary>
+            来源
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.OccupationMapJobInfo.occupName">
+            <summary>
+            职业名称
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.OccupationMapJobInfo.companyName">
+            <summary>
+            公司名称
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.OccupationMapJobInfo.jobName">
+            <summary>
+            岗位名称
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.OccupationMapJobInfo.jobarea">
+            <summary>
+            工作位置
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.OccupationMapJobInfo.salary">
+            <summary>
+            薪资
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.OccupationMapJobInfo.keyword">
+            <summary>
+            岗位要求
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.OccupationMapJobInfo.companykeyword">
+            <summary>
+            公司重点
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.OccupationMapJobInfo.skillrequirements">
+            <summary>
+            技能要求
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.OccupationMapJobInfo.tag">
+            <summary>
+            标签
+            </summary>
+        </member>
+        <member name="P:New_College.Model.Models.OccupationMapJobInfo.description">
+            <summary>
+            公司福利描述
+            </summary>
+        </member>
         <member name="T:New_College.Model.Models.OperateLog">
             <summary>
             日志记录
@@ -5550,41 +5630,6 @@
             
             </summary>
         </member>
-        <member name="P:New_College.Model.ViewModels.OccupationResult.Id">
-            <summary>
-            主键id
-            </summary>
-        </member>
-        <member name="P:New_College.Model.ViewModels.OccupationResult.Name">
-            <summary>
-            职业名称
-            </summary>
-        </member>
-        <member name="T:New_College.Model.ViewModels.OccupationDetailResult">
-            <summary>
-            职业
-            </summary>
-        </member>
-        <member name="P:New_College.Model.ViewModels.OccupationDetailResult.Id">
-            <summary>
-            主键id
-            </summary>
-        </member>
-        <member name="P:New_College.Model.ViewModels.OccupationDetailResult.Name">
-            <summary>
-            职业名称
-            </summary>
-        </member>
-        <member name="P:New_College.Model.ViewModels.OccupationDetailResult.Sort">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="P:New_College.Model.ViewModels.OccupationDetailResult.OccupationIntraduce">
-            <summary>
-            职业介绍
-            </summary>
-        </member>
         <member name="P:New_College.Model.ViewModels.ProbabilityResult.UniversityName">
             <summary>
             院校名称
@@ -7090,6 +7135,11 @@
             招生计划Id列表逗号隔开
             </summary>
         </member>
+        <member name="P:New_College.Model.OccupationMapJobInfoRequest.OccupName">
+            <summary>
+            职位名称
+            </summary>
+        </member>
         <member name="P:New_College.Model.QualificationLineResponse.UId">
             <summary>
             院校Id
@@ -7125,6 +7175,71 @@
             招生类型
             </summary>
         </member>
+        <member name="P:New_College.Model.MinOccupationRequest.Name">
+            <summary>
+            是否带查询
+            </summary>
+        </member>
+        <member name="P:New_College.Model.MinOccupationRequest.IsHot">
+            <summary>
+            是否热门岗位
+            </summary>
+        </member>
+        <member name="P:New_College.Model.OccupationResult.Id">
+            <summary>
+            主键id
+            </summary>
+        </member>
+        <member name="P:New_College.Model.OccupationResult.Name">
+            <summary>
+            职业名称
+            </summary>
+        </member>
+        <member name="T:New_College.Model.OccupationDetailResult">
+            <summary>
+            职业
+            </summary>
+        </member>
+        <member name="P:New_College.Model.OccupationDetailResult.Id">
+            <summary>
+            主键id
+            </summary>
+        </member>
+        <member name="P:New_College.Model.OccupationDetailResult.Name">
+            <summary>
+            职业名称
+            </summary>
+        </member>
+        <member name="P:New_College.Model.OccupationDetailResult.Sort">
+            <summary>
+            排序
+            </summary>
+        </member>
+        <member name="P:New_College.Model.OccupationDetailResult.Prospects">
+            <summary>
+            发展前景
+            </summary>
+        </member>
+        <member name="P:New_College.Model.OccupationDetailResult.Requirements">
+            <summary>
+            岗位要求
+            </summary>
+        </member>
+        <member name="P:New_College.Model.OccupationDetailResult.PersonProspects">
+            <summary>
+            个人发展
+            </summary>
+        </member>
+        <member name="P:New_College.Model.OccupationDetailResult.OccuptionTrend">
+            <summary>
+            职业就业趋势
+            </summary>
+        </member>
+        <member name="P:New_College.Model.OccupationDetailResult.OccupationIntraduce">
+            <summary>
+            职业介绍
+            </summary>
+        </member>
         <member name="P:New_College.Model.SeVolunterInitializationDto.Policy">
             <summary>
             

New_College.Api/New_College.xml

@@ -343,7 +343,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:New_College.Api.Controllers.Front.LibraryController.uniGetOccupationInfo">
+        <member name="M:New_College.Api.Controllers.Front.LibraryController.uniGetOccupationInfo(New_College.Model.MinOccupationRequest)">
             <summary>
             职业库  一级二级列表
             </summary>
@@ -979,6 +979,18 @@
             <param name="highSchoolRank">通过省份名称当作过滤条件模糊查询学校名称</param>
             <returns></returns>
         </member>
+        <member name="F:New_College.Api.Controllers.MapJobInfoController._occupationMapJobInfoServices">
+            <summary>
+            服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
+            </summary>
+        </member>
+        <member name="M:New_College.Api.Controllers.MapJobInfoController.Get(New_College.Model.OccupationMapJobInfoRequest)">
+            <summary>
+            根据职业名称查询岗位信息列表
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="F:New_College.Api.Controllers.SeVolunteerInitializationController._d_SeVolunteerInitializationServices">
             <summary>
             服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下

New_College.IServices/ID_LongIdMapServices.cs

@@ -2,6 +2,7 @@
 using New_College.Model;
 using New_College.Model.Models;
 using New_College.Model.ViewModels;
+using Org.BouncyCastle.Asn1.Ocsp;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -27,9 +28,9 @@ namespace New_College.IServices
 
         Task<List<OccupationResult>> GetRecommendOccupation();
 
-        Task<List<uniMajorInfoResult>> uniGetOccupationInfo();
+        Task<List<uniMajorInfoResult>> uniGetOccupationInfo(MinOccupationRequest request);
 
-        Task<List<pcMajorInfoResult>> pcGetOccupationInfo();
+        Task<List<pcMajorInfoResult>> pcGetOccupationInfo(string name = null);
 
         Task<UniversityDetailResponse> GetUniversityDetails(IdQuery query);
 

New_College.IServices/IOccupationMapJobInfoServices.cs

@@ -0,0 +1,12 @@
+using New_College.IServices.BASE;
+using New_College.Model.Models;
+
+namespace New_College.IServices
+{	
+	/// <summary>
+	/// IOccupationMapJobInfoServices
+	/// </summary>	
+    public interface IOccupationMapJobInfoServices :IBaseServices<OccupationMapJobInfo>
+	{
+    }
+}

New_College.Model/Models/D_Occupation.cs

@@ -28,6 +28,31 @@ namespace New_College.Model.Models
         [SugarColumn(ColumnDataType = "longtext", Length = int.MaxValue, IsNullable = true)]
         public string OccupationIntraduce { get; set; }
 
+        /// <summary>
+        /// 工作内容
+        /// </summary>
+        [SugarColumn(IsNullable = true)]
+        public string JobContent { get; set; }
+        /// <summary>
+        /// 发展前景
+        /// </summary>
+        public string Prospects { get; set; }
+
+        /// <summary>
+        /// 岗位要求
+        /// </summary>
+        public string Requirements { get; set; }
+
+        /// <summary>
+        /// 个人发展
+        /// </summary>
+        public string PersonProspects { get; set; }
+
+        /// <summary>
+        /// 职业就业趋势
+        /// </summary>
+        public string OccuptionTrend { get; set; }
+
         /// <summary>
         /// 是否推荐，0为不推荐，1为推荐
         /// </summary>

New_College.Model/Models/OccupationMapJobInfo.cs

@@ -0,0 +1,70 @@
+using Essensoft.AspNetCore.Payment.Alipay.Domain;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace New_College.Model.Models
+{
+    public class OccupationMapJobInfo : EntityModel
+    {
+
+        /// <summary>
+        /// 来源
+        /// </summary>
+        public string source { get; set; }
+
+        /// <summary>
+        /// 职业名称
+        /// </summary>
+        public string occupName { get; set; }
+
+        /// <summary>
+        /// 公司名称
+        /// </summary>
+        public string companyName { get; set; }
+
+        /// <summary>
+        /// 岗位名称
+        /// </summary>
+        public string jobName { get; set; }
+
+        /// <summary>
+        /// 工作位置
+        /// </summary>
+        public string jobarea { get; set; }
+
+        /// <summary>
+        /// 薪资
+        /// </summary>
+        public string salary { get; set; }
+
+        /// <summary>
+        /// 岗位要求
+        /// </summary>
+        public string keyword { get; set; }
+
+        /// <summary>
+        /// 公司重点
+        /// </summary>
+        public string companykeyword { get; set; }
+
+        /// <summary>
+        /// 技能要求
+        /// </summary>
+        public string skillrequirements { get; set; }
+
+        /// <summary>
+        /// 标签
+        /// </summary>
+        public string tag { get; set; }
+
+        /// <summary>
+        /// 公司福利描述
+        /// </summary>
+        public string description { get; set; }
+
+
+    }
+}

New_College.Model/ViewModels/OccupationMapJobInfoRequest.cs

@@ -0,0 +1,18 @@
+using New_College.Model.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace New_College.Model
+{
+    public class OccupationMapJobInfoRequest : BasePageRequest
+    {
+        /// <summary>
+        /// 职位名称
+        /// </summary>
+        public string OccupName { get; set; }
+
+    }
+}

New_College.Model/ViewModels/Result/OccupationResult.cs

@@ -2,8 +2,23 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace New_College.Model.ViewModels
+namespace New_College.Model
 {
+
+    public class MinOccupationRequest
+    {
+        /// <summary>
+        /// 是否带查询
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 是否热门岗位
+        /// </summary>
+        public bool IsHot { get; set; }
+
+    }
+
     public class OccupationResult
     {
         /// <summary>
@@ -43,9 +58,191 @@ namespace New_College.Model.ViewModels
         /// 排序
         /// </summary>
         public int Sort { get; set; }
+
+
+        public string JobContent { get; set; }
+        /// <summary>
+        /// 发展前景
+        /// </summary>
+        public string Prospects { get; set; }
+
+        /// <summary>
+        /// 岗位要求
+        /// </summary>
+        public string Requirements { get; set; }
+
+        /// <summary>
+        /// 个人发展
+        /// </summary>
+        public string PersonProspects { get; set; }
+
+        /// <summary>
+        /// 职业就业趋势
+        /// </summary>
+        public string OccuptionTrend { get; set; }
+
         /// <summary>
         /// 职业介绍
         /// </summary>
         public string OccupationIntraduce { get; set; }
     }
+
+    public class Result
+    {
+        public int totalCount { get; set; }
+        public Item[] items { get; set; }
+    }
+
+    public class Item
+    {
+        public int numId { get; set; }
+        public string code { get; set; }
+        public string gbCode { get; set; }
+        public string cnName { get; set; }
+        public string logoUrl { get; set; }
+        public string natureType { get; set; }
+        public string eduLevel { get; set; }
+        public string belong { get; set; }
+        public string[] categories { get; set; }
+        public string[] features { get; set; }
+        public object[] artFeatures { get; set; }
+        public string provinceCode { get; set; }
+        public string provinceName { get; set; }
+        public string cityName { get; set; }
+        public int hits { get; set; }
+        public int ranking { get; set; }
+        public int rankingOfWSL { get; set; }
+        public int rankingOfRK { get; set; }
+        public int rankingOfXYH { get; set; }
+        public int rankingOfQS { get; set; }
+        public int rankingOfUSNews { get; set; }
+        public int rankingOfEdu { get; set; }
+        public float comScore { get; set; }
+        public string id { get; set; }
+    }
+
+
+
+
+    public class UniversityDetailobject
+    {
+        public DetailResult result { get; set; }
+        public string code { get; set; }
+        public string message { get; set; }
+        public string fullMessage { get; set; }
+        public DateTime timestamp { get; set; }
+        public bool isSuccess { get; set; }
+    }
+
+    public class DetailResult
+    {
+        public int numId { get; set; }
+        public string code { get; set; }
+        public string gbCode { get; set; }
+        public string cnName { get; set; }
+        public string logoUrl { get; set; }
+        public string vrUrl { get; set; }
+        public string vrShortUrl { get; set; }
+        public string provinceCode { get; set; }
+        public string provinceName { get; set; }
+        public string cityName { get; set; }
+        public Address[] address { get; set; }
+        public string createdYear { get; set; }
+        public string celebrateDay { get; set; }
+        public string natureType { get; set; }
+        public string eduLevel { get; set; }
+        public string[] categories { get; set; }
+        public string[] features { get; set; }
+        public object[] artFeatures { get; set; }
+        public string[] entranceType { get; set; }
+        public string belong { get; set; }
+        public string introduction { get; set; }
+        public Nameused[] nameUsed { get; set; }
+        public string enName { get; set; }
+        public string shortName { get; set; }
+        public string motto { get; set; }
+        public string song { get; set; }
+        public string songMp3Url { get; set; }
+        public Award[] awards { get; set; }
+        public int numberOfStu { get; set; }
+        public int maleRateOfStu { get; set; }
+        public int femaleRateOfStu { get; set; }
+        public int numberOfBen { get; set; }
+        public int maleRateOfBen { get; set; }
+        public int femaleRateOfBen { get; set; }
+        public int numberOfYan { get; set; }
+        public int maleRateOfYan { get; set; }
+        public int femaleRateOfYan { get; set; }
+        public int numberOfBo { get; set; }
+        public int maleRateOfBo { get; set; }
+        public int femaleRateOfBo { get; set; }
+        public Pointsofshuo[] pointsOfShuo { get; set; }
+        public Pointsofbo[] pointsOfBo { get; set; }
+        public int numberOfBSH { get; set; }
+        public object[] academicians { get; set; }
+        public string rateOfBaoYan { get; set; }
+        public object[] histories { get; set; }
+        public object[] alumnis { get; set; }
+        public string webSite { get; set; }
+        public string zhaoBanWZ { get; set; }
+        public string[] zhaoBanDH { get; set; }
+        public string shuoShiWebSite { get; set; }
+        public string shuoShiZBWZ { get; set; }
+        public string[] shuoShiZBDH { get; set; }
+        public string lastOperator { get; set; }
+        public DateTime updatedAt { get; set; }
+        public string bannerUrl { get; set; }
+        public int hits { get; set; }
+        public string[] bxType { get; set; }
+        public string[] bxLevel { get; set; }
+        public string star { get; set; }
+        public string majorRule { get; set; }
+        public int rankingOfWSL { get; set; }
+        public int rankingOfRK { get; set; }
+        public int rankingOfXYH { get; set; }
+        public int rankingOfUSNews { get; set; }
+        public int rankingOfQS { get; set; }
+        public int rankingOfEdu { get; set; }
+        public string id { get; set; }
+    }
+
+    public class Address
+    {
+        public string name { get; set; }
+        public string address { get; set; }
+        public string coordinate { get; set; }
+    }
+
+    public class Nameused
+    {
+        public int startYear { get; set; }
+        public string startTimeText { get; set; }
+        public string endTimeText { get; set; }
+        public int endYear { get; set; }
+        public string name { get; set; }
+    }
+
+    public class Award
+    {
+        public string name { get; set; }
+        public int year { get; set; }
+        public int month { get; set; }
+    }
+
+    public class Pointsofshuo
+    {
+        public int number { get; set; }
+        public string type { get; set; }
+    }
+
+    public class Pointsofbo
+    {
+        public int number { get; set; }
+        public string type { get; set; }
+    }
+
+
+
+
+
 }

New_College.Repository/BASE/IOccupationMapJobInfoRepository.cs

@@ -0,0 +1,12 @@
+using New_College.IRepository.Base;
+using New_College.Model.Models;
+
+namespace New_College.IRepository
+{
+	/// <summary>
+	/// IOccupationMapJobInfoRepository
+	/// </summary>	
+    public interface IOccupationMapJobInfoRepository : IBaseRepository<OccupationMapJobInfo>
+    {
+    }
+}

New_College.Repository/BASE/OccupationMapJobInfoRepository.cs

@@ -0,0 +1,17 @@
+using New_College.IRepository;
+using New_College.IRepository.UnitOfWork;
+using New_College.Model.Models;
+using New_College.Repository.Base;
+
+namespace New_College.Repository
+{
+	/// <summary>
+	/// OccupationMapJobInfoRepository
+	/// </summary>
+    public class OccupationMapJobInfoRepository : BaseRepository<OccupationMapJobInfo>, IOccupationMapJobInfoRepository
+    {
+        public OccupationMapJobInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
+        {
+        }
+    }
+}

New_College.Services/D_LongIdMapServices.cs

@@ -265,11 +265,16 @@ namespace New_College.Services
         /// 职业库  一级二级列表
         /// </summary>
         /// <returns></returns>
-        public async Task<List<uniMajorInfoResult>> uniGetOccupationInfo()
+        public async Task<List<uniMajorInfoResult>> uniGetOccupationInfo(MinOccupationRequest request)
         {
             List<uniMajorInfoResult> list = new List<uniMajorInfoResult>() { };
             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 occupations = (await d_OccupationRepository.Query(x => x.IsDelete == false)).Select(s => s.CategoryId).ToList();
+            Expression<Func<D_Occupation, bool>> expression = Expressionable.Create<D_Occupation>()
+                 .And(x => x.IsDelete == false)
+                 .AndIF(!string.IsNullOrWhiteSpace(request.Name), x => SqlFunc.Contains(x.Name, request.Name))
+                 .AndIF(request.IsHot, x => x.Recommend > 0)
+                .ToExpression();
+            var occupations = (await d_OccupationRepository.Query(expression)).Select(s => s.CategoryId).ToList();
             var nowoccupationCategoryList = occupationCategoryList.Where(x => x.Level == 0).ToList();
             foreach (var item in nowoccupationCategoryList)
             {
@@ -280,7 +285,6 @@ namespace New_College.Services
                     MajorName = s.OccupationName,
                     MajorNum = occupations.Count(e => e == s.Id),
                     SecondId = s.Id
-
                 }).ToList();
                 list.Add(new uniMajorInfoResult()
                 {
@@ -292,11 +296,16 @@ namespace New_College.Services
         }
 
 
-        public async Task<List<pcMajorInfoResult>> pcGetOccupationInfo()
+        public async Task<List<pcMajorInfoResult>> pcGetOccupationInfo(string name = null)
         {
             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);
+
+            Expression<Func<D_Occupation, bool>> expression = Expressionable.Create<D_Occupation>()
+                  .And(x => x.IsDelete == false)
+                  .AndIF(!string.IsNullOrWhiteSpace(name), x => SqlFunc.Contains(x.Name, name))
+                 .ToExpression();
+            var queryoccupations = await d_OccupationRepository.Query(expression);
             var occupations = queryoccupations.Select(s => s.CategoryId).ToList();
             var nowoccupationCategoryList = occupationCategoryList.Where(x => x.Level == 0).ToList();
             foreach (var item in nowoccupationCategoryList)
@@ -784,6 +793,11 @@ namespace New_College.Services
             {
                 Status = 1,
                 OccupationIntraduce = occupation.OccupationIntraduce.ClearHtml(),
+                JobContent = occupation.JobContent,
+                Name = occupation.Name,
+                Prospects = occupation.Prospects,
+                Requirements = occupation.Requirements,
+                Sort = occupation.OrderSort,
                 Id = occupation.Id.ToString()
             };
         }
@@ -875,6 +889,10 @@ namespace New_College.Services
         }
 
 
+
+
+
+
         /// <summary>
         /// 专业搜索
         /// </summary>
@@ -1847,181 +1865,6 @@ namespace New_College.Services
 
 
 
-        public class httphelperdetailrequest
-        {
-
-            public string code { get; set; }
-        }
-        public class HttpHelperPostRequest
-        {
-            public int pageIndex { get; set; }
-
-        }
-
-
-        public class HttpHelperPostobject
-        {
-            public Result result { get; set; }
-            public string code { get; set; }
-            public string message { get; set; }
-            public string fullMessage { get; set; }
-            public DateTime timestamp { get; set; }
-            public bool isSuccess { get; set; }
-        }
-
-        public class Result
-        {
-            public int totalCount { get; set; }
-            public Item[] items { get; set; }
-        }
-
-        public class Item
-        {
-            public int numId { get; set; }
-            public string code { get; set; }
-            public string gbCode { get; set; }
-            public string cnName { get; set; }
-            public string logoUrl { get; set; }
-            public string natureType { get; set; }
-            public string eduLevel { get; set; }
-            public string belong { get; set; }
-            public string[] categories { get; set; }
-            public string[] features { get; set; }
-            public object[] artFeatures { get; set; }
-            public string provinceCode { get; set; }
-            public string provinceName { get; set; }
-            public string cityName { get; set; }
-            public int hits { get; set; }
-            public int ranking { get; set; }
-            public int rankingOfWSL { get; set; }
-            public int rankingOfRK { get; set; }
-            public int rankingOfXYH { get; set; }
-            public int rankingOfQS { get; set; }
-            public int rankingOfUSNews { get; set; }
-            public int rankingOfEdu { get; set; }
-            public float comScore { get; set; }
-            public string id { get; set; }
-        }
-
-
-
-
-        public class UniversityDetailobject
-        {
-            public DetailResult result { get; set; }
-            public string code { get; set; }
-            public string message { get; set; }
-            public string fullMessage { get; set; }
-            public DateTime timestamp { get; set; }
-            public bool isSuccess { get; set; }
-        }
-
-        public class DetailResult
-        {
-            public int numId { get; set; }
-            public string code { get; set; }
-            public string gbCode { get; set; }
-            public string cnName { get; set; }
-            public string logoUrl { get; set; }
-            public string vrUrl { get; set; }
-            public string vrShortUrl { get; set; }
-            public string provinceCode { get; set; }
-            public string provinceName { get; set; }
-            public string cityName { get; set; }
-            public Address[] address { get; set; }
-            public string createdYear { get; set; }
-            public string celebrateDay { get; set; }
-            public string natureType { get; set; }
-            public string eduLevel { get; set; }
-            public string[] categories { get; set; }
-            public string[] features { get; set; }
-            public object[] artFeatures { get; set; }
-            public string[] entranceType { get; set; }
-            public string belong { get; set; }
-            public string introduction { get; set; }
-            public Nameused[] nameUsed { get; set; }
-            public string enName { get; set; }
-            public string shortName { get; set; }
-            public string motto { get; set; }
-            public string song { get; set; }
-            public string songMp3Url { get; set; }
-            public Award[] awards { get; set; }
-            public int numberOfStu { get; set; }
-            public int maleRateOfStu { get; set; }
-            public int femaleRateOfStu { get; set; }
-            public int numberOfBen { get; set; }
-            public int maleRateOfBen { get; set; }
-            public int femaleRateOfBen { get; set; }
-            public int numberOfYan { get; set; }
-            public int maleRateOfYan { get; set; }
-            public int femaleRateOfYan { get; set; }
-            public int numberOfBo { get; set; }
-            public int maleRateOfBo { get; set; }
-            public int femaleRateOfBo { get; set; }
-            public Pointsofshuo[] pointsOfShuo { get; set; }
-            public Pointsofbo[] pointsOfBo { get; set; }
-            public int numberOfBSH { get; set; }
-            public object[] academicians { get; set; }
-            public string rateOfBaoYan { get; set; }
-            public object[] histories { get; set; }
-            public object[] alumnis { get; set; }
-            public string webSite { get; set; }
-            public string zhaoBanWZ { get; set; }
-            public string[] zhaoBanDH { get; set; }
-            public string shuoShiWebSite { get; set; }
-            public string shuoShiZBWZ { get; set; }
-            public string[] shuoShiZBDH { get; set; }
-            public string lastOperator { get; set; }
-            public DateTime updatedAt { get; set; }
-            public string bannerUrl { get; set; }
-            public int hits { get; set; }
-            public string[] bxType { get; set; }
-            public string[] bxLevel { get; set; }
-            public string star { get; set; }
-            public string majorRule { get; set; }
-            public int rankingOfWSL { get; set; }
-            public int rankingOfRK { get; set; }
-            public int rankingOfXYH { get; set; }
-            public int rankingOfUSNews { get; set; }
-            public int rankingOfQS { get; set; }
-            public int rankingOfEdu { get; set; }
-            public string id { get; set; }
-        }
-
-        public class Address
-        {
-            public string name { get; set; }
-            public string address { get; set; }
-            public string coordinate { get; set; }
-        }
-
-        public class Nameused
-        {
-            public int startYear { get; set; }
-            public string startTimeText { get; set; }
-            public string endTimeText { get; set; }
-            public int endYear { get; set; }
-            public string name { get; set; }
-        }
-
-        public class Award
-        {
-            public string name { get; set; }
-            public int year { get; set; }
-            public int month { get; set; }
-        }
-
-        public class Pointsofshuo
-        {
-            public int number { get; set; }
-            public string type { get; set; }
-        }
-
-        public class Pointsofbo
-        {
-            public int number { get; set; }
-            public string type { get; set; }
-        }
 
 
 

New_College.Services/OccupationMapJobInfoServices.cs

@@ -0,0 +1,18 @@
+
+using New_College.IServices;
+using New_College.Model.Models;
+using New_College.Services.BASE;
+using New_College.IRepository.Base;
+
+namespace New_College.Services
+{
+    public class OccupationMapJobInfoServices : BaseServices<OccupationMapJobInfo>, IOccupationMapJobInfoServices
+    {
+        private readonly IBaseRepository<OccupationMapJobInfo> _dal;
+        public OccupationMapJobInfoServices(IBaseRepository<OccupationMapJobInfo> dal)
+        {
+            this._dal = dal;
+            base.BaseDal = dal;
+        }
+    }
+}