From 40b5e16f9e3a854d8de7aebc621c45e125367554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?old=E6=98=93?= <156663459@qq.com>
Date: Mon, 4 Dec 2023 15:55:01 +0800
Subject: [PATCH] =?UTF-8?q?bug=20fixed-=E4=BB=A3=E7=A0=81=E6=9D=A1?=
=?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/Front/PcVolunteerController.cs | 4 ++--
New_College.Api/New_College.Model.xml | 10 ++++++++++
New_College.Services/D_LongIdMapServices.cs | 6 +++---
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/New_College.Api/Controllers/Front/PcVolunteerController.cs b/New_College.Api/Controllers/Front/PcVolunteerController.cs
index 409498d..2a3af67 100644
--- a/New_College.Api/Controllers/Front/PcVolunteerController.cs
+++ b/New_College.Api/Controllers/Front/PcVolunteerController.cs
@@ -203,8 +203,8 @@ namespace New_College.Api.Controllers.Front
var vol = (await _VolunteerTableServices.Query(c => c.CustomerId == request.CustomerId));
if (vol.Any())
{
- request.VolunteerTableName = "我的志愿表" + vol.FirstOrDefault().Id + 1;
- ordersort = vol.FirstOrDefault().Id + 1;
+ request.VolunteerTableName = "我的志愿表" + vol.OrderByDescending(c=>c.CreateTime).FirstOrDefault().OrderSort + 1;
+ ordersort = vol.OrderByDescending(c => c.CreateTime).FirstOrDefault().OrderSort + 1;
}
else
{
diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml
index 38309f7..44017b6 100644
--- a/New_College.Api/New_College.Model.xml
+++ b/New_College.Api/New_College.Model.xml
@@ -5980,6 +5980,16 @@
创办时间
+
+
+ 地址
+
+
+
+
+ 电话
+
+
院士数
diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs
index a61588d..a2d078e 100644
--- a/New_College.Services/D_LongIdMapServices.cs
+++ b/New_College.Services/D_LongIdMapServices.cs
@@ -797,9 +797,9 @@ namespace New_College.Services
public async Task GetBatchYearBySchoolId(PlanYearQuery query)
{
BatchYear result = new BatchYear() { };
- var info = await d_PlanMajorDescRepository.Query(x => x.UId == query.UnviersityId);
- if (info.Count <= 0)
- return new BatchYear() { };
+ //var info = await d_PlanMajorDescRepository.Query(x => x.UId == query.UnviersityId);
+ //if (info.Count <= 0)
+ // return new BatchYear() { };
var batchinfo = await t_EnrollmentBatchRepository.Query(x => x.AreaName == query.AreaName && x.IsDelete == false);
var batchselect = batchinfo.Select(x => x.Batch_name).Distinct().ToList();
var yearselect = batchinfo.Select(x => x.Year).Distinct().OrderByDescending(x => x).ToList();