From 0950f52639e051635c03ec7c68a1df0c91bf56a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Tue, 30 Jan 2024 10:04:39 +0800
Subject: [PATCH] feat:bug fixed

---
 .../Front/OccupationMapJobInfoController.cs   |  2 +-
 New_College.Services/D_LongIdMapServices.cs   | 39 ++++++++++++++++++-
 New_College.Services/V_OrderInfoServices.cs   |  2 +-
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/New_College.Api/Controllers/Front/OccupationMapJobInfoController.cs b/New_College.Api/Controllers/Front/OccupationMapJobInfoController.cs
index cde78ee..717ecc4 100644
--- a/New_College.Api/Controllers/Front/OccupationMapJobInfoController.cs
+++ b/New_College.Api/Controllers/Front/OccupationMapJobInfoController.cs
@@ -45,7 +45,7 @@ namespace New_College.Api.Controllers
                     status = 200
                 };
             }
-            request.OccupName = "后端开发";
+           // request.OccupName = "后端开发";
             var query = await _occupationMapJobInfoServices.QueryPage(c => SqlFunc.Contains(c.occupName, request.OccupName), request.PageIndex, request.PageSize);
             return new MessageModel<PageModel<OccupationMapJobInfo>>()
             {
diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs
index 7cd3472..8bddf4f 100644
--- a/New_College.Services/D_LongIdMapServices.cs
+++ b/New_College.Services/D_LongIdMapServices.cs
@@ -57,6 +57,7 @@ namespace New_College.Services
         private readonly ID_PlanMajorDescRepository d_PlanMajorDescRepository;
         private readonly ID_PlanMajorDescProRepository d_PlanMajorDescProRepository;
         private readonly IT_TbSNeedDataInfoRepository t_TbSNeedDataInfoRepository;
+
         public D_LongIdMapServices(IBaseRepository<D_LongIdMap> dal
             , ID_MajorCategoryRepository ID_MajorCategoryRepository
             , ID_MajorClassRepository ID_MajorClassRepository
@@ -201,7 +202,7 @@ namespace New_College.Services
             var expression = Expressionable.Create<D_Major>()
              .And(x => x.IsDelete == false)
                 //.And(x => x.Type != 3)
-                .AndIF(!string.IsNullOrEmpty(query.MajorName),x=>SqlFunc.Contains(x.MajorName,query.MajorName))
+                .AndIF(!string.IsNullOrEmpty(query.MajorName), x => SqlFunc.Contains(x.MajorName, query.MajorName))
                 .ToExpression();
             var majorcategories = (await d_MajorCategoryRepository.Query(x => x.Type == query.SchoolLevel && x.IsDelete == false)).Select(x => new uniMajorSelect() { Id = x.Id, Name = x.Name }); ;
             var majorclasses = (await d_MajorClassRepository.Query(x => x.IsDelete == false)).Select(x => new uniMajorClassSelect() { Id = x.Id, Name = x.Name, TradeId = x.TradeId });
@@ -226,7 +227,7 @@ namespace New_College.Services
                         {
                             FirstName = item.Name,
                             RootId = item.Id,
-                            SecondInfo = scond.Where(w=>w.MajorNum>0).ToList(),
+                            SecondInfo = scond.Where(w => w.MajorNum > 0).ToList(),
                         });
                     }
                 }
@@ -1994,6 +1995,40 @@ namespace New_College.Services
         public async Task<bool> UpdatePlanProInf()
         {
             var tbinfo = await t_TbSNeedDataInfoRepository.Query();
+            var universitylist = await d_UniversityRepository.Query();
+            var majorlist = await d_MajorRepository.Query();
+
+            #region 院校专业关联
+
+            var models = new List<D_MajorMapUniversity>();
+            tbinfo.ForEach(a =>
+            {
+                if (universitylist.Where(e => e.Name == a.UniversityName).Any())
+                {
+                    if (majorlist.Where(e => a.MajorName.Contains(e.Name)).Any())
+                    {
+                        var mid = majorlist.Where(e => a.MajorName.Contains(e.Name)).FirstOrDefault().Id;
+                        var uid = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Id;
+                        if (!models.Where(e => e.Universityid == uid && e.MajorId == mid).Any())
+                        {
+                            models.Add(new D_MajorMapUniversity()
+                            {
+                                CreateTime = DateTime.UtcNow,
+                                IsDelete = false,
+                                ModifyTime = DateTime.UtcNow,
+                                OrderSort = 0,
+                                sp = 0,
+                                MajorId = majorlist.Where(e => a.MajorName.Contains(e.Name)).FirstOrDefault().Id,
+                                Universityid = universitylist.Where(e => e.Name == a.UniversityName).FirstOrDefault().Id
+                            });
+                        }
+                    }
+                }
+            });
+            await d_MajorMapUniversityRepository.Add(models);
+            #endregion
+
+
             //var universitylist=await un
             #region 更新专业计划信息
             //var plist = await this._PlanMajorDescRepository.Query(c => c.Location == "山东省" && c.Years == 2023 && c.IsDelete == false && c.UId <= 0);
diff --git a/New_College.Services/V_OrderInfoServices.cs b/New_College.Services/V_OrderInfoServices.cs
index b4c72a6..7e76f99 100644
--- a/New_College.Services/V_OrderInfoServices.cs
+++ b/New_College.Services/V_OrderInfoServices.cs
@@ -293,7 +293,7 @@ namespace New_College.Services
                .AndIF(!string.IsNullOrWhiteSpace(query.out_trade_no), x => x.out_trade_no.Contains(query.out_trade_no))
                .AndIF(query.CardTypeId > 0, x => x.CardTypeId == query.CardTypeId)  //根据卡片类别查询
                .ToExpression();
-            var info = await _dal.QueryPage(wheres, query.PageIndex, query.PageSize, "CreateTime desc");
+            var info = await _dal.QueryPage(wheres, query.PageIndex, query.PageSize);
             if (info.data.Count <= 0)
                 return new MessageModel<PageModel<OrderInfoQuery>>()
                 {