From 1e089bcab3e693cc0980a68c45d66a69f30bb1c1 Mon Sep 17 00:00:00 2001 From: tanglong <842690096@qq.com> Date: Thu, 28 May 2026 15:44:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VOL.Business/Services/School/S_ClassService.cs | 5 ++++- VOL.Entity/DomainModels/ShangWaiMao/TempTccj.cs | 3 +-- VOL.WebApi/appsettings.json | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/VOL.Business/Services/School/S_ClassService.cs b/VOL.Business/Services/School/S_ClassService.cs index a36da15..ae55629 100644 --- a/VOL.Business/Services/School/S_ClassService.cs +++ b/VOL.Business/Services/School/S_ClassService.cs @@ -683,6 +683,9 @@ namespace VOL.Business.Services.School { var stuResults = monitorList.FirstOrDefault(c => c.StudentNo == stu.StudentNo); + if (stuResults == null) + continue; + res.ClassDetailsList.Add(new ClassDetails() { StudentNo = stu.StudentNo, @@ -691,7 +694,7 @@ namespace VOL.Business.Services.School GradeAndClassName = $"{classModel.GradeName}-{classModel.ClassName}", GradeId = classModel.GradeId, ClassId = classModel.Id, - Rank = stuResults.Rank + Rank = stuResults.Rank ?? "" }); } diff --git a/VOL.Entity/DomainModels/ShangWaiMao/TempTccj.cs b/VOL.Entity/DomainModels/ShangWaiMao/TempTccj.cs index b2ea799..ca3fdcb 100644 --- a/VOL.Entity/DomainModels/ShangWaiMao/TempTccj.cs +++ b/VOL.Entity/DomainModels/ShangWaiMao/TempTccj.cs @@ -1,5 +1,4 @@ using System.ComponentModel.DataAnnotations.Schema; -using VOL.Entity.SystemModels; namespace VOL.Entity.DomainModels { @@ -7,7 +6,7 @@ namespace VOL.Entity.DomainModels /// 上外贸体测成绩临时表 /// [Table("temp_tccj")] - public class TempTccj : BaseEntity + public class TempTccj { public string school_year { get; set; } public string school_term { get; set; } diff --git a/VOL.WebApi/appsettings.json b/VOL.WebApi/appsettings.json index 6fb4a1e..8d71486 100644 --- a/VOL.WebApi/appsettings.json +++ b/VOL.WebApi/appsettings.json @@ -20,7 +20,7 @@ //mysql连接字符串(升级EFCore3.1到时已将mysql连接字符串修改,2019-12-20) "DbConnectionString": "Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB_QA;User ID=yd;Password=Admin@123456;Connect Timeout=500;", - //"DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;", + // "DbConnectionString": " Data Source=rm-uf64b8oxdt19pfyxfao.sqlserver.rds.aliyuncs.com;Database=SmartSportsServerDB;User ID=yd;Password=Admin@123456;Connect Timeout=500;", //"DbConnectionString": "Server=192.168.10.230;Port=3306;Database=dachentradedb;Uid=root;Pwd=123456;AllowLoadLocalInfile=true;Command Timeout=120;", //"DbConnectionString": "Server=47.101.60.251;Port=3306;Database=smartsports;Uid=root;Pwd=Admin@123;AllowLoadLocalInfile=true;Command Timeout=120;",