yly
/
NewGaoKaoApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsd

develop
liuyangyi 2024-06-14 00:45:29 +08:00
parent 6830984847
commit cf5e605dfa
5 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
New_College.Api/Controllers/Front/FrontSelectionController.cs
View File

@ -126,17 +126,23 @@ namespace New_College.Api.Controllers.Front
.And(w => w.AcademicYear == DateTime.Now.Year.ToString())
.ToExpression();//注意 这一句 不能少
var subjectlist = await _selectionServices.Query(exp);
response = subjectlist.Select(c => new SelectionResponseDto()
var rplist = subjectlist.Select(c => new SelectionMajorDto()
{
MajorName = c.MajorName
}).ToList();
response.ForEach(a =>
MajorName = c.MajorName.Contains("(") ? c.MajorName.Split('(')[0].ToString() : c.MajorName
}).DistinctBy(c => c.MajorName).ToList();
rplist.ForEach(a =>
{
a.selects = subjectlist.Where(e => e.MajorName == a.MajorName).Select(c => new SelectResponseDto()
var selectlist = subjectlist.Where(e => e.MajorName.Contains(a.MajorName)).Select(c => new SelectResponseDto()
{
Selection = c.Selection,
UniversityName = c.UniversityName
}).ToList();
Selection = c.Selection.ToString(),
UniversityName = c.UniversityName.ToString()
}).Distinct().ToList();
response.Add(new SelectionResponseDto()
{
selects = selectlist,
MajorName = a.MajorName
});
});
return new MessageModel<List<SelectionResponseDto>>()
{

4
New_College.Api/appsettings.Development.json
View File

@ -97,14 +97,14 @@
"DBType": 0,
"Enabled": true,
"HitRate": 20,
"Connection": "Server=192.168.104.103; Port=3306;SslMode=None;Database=volunteerapp; Uid=volunteerapp; Pwd=Vs..127134;CharSet=utf8mb4;AllowLoadLocalInfile=true;SslMode=none"
"Connection": "Server=192.168.104.108; Port=3306;SslMode=None;Database=volunteerapp; Uid=root; Pwd=Vs..127134;CharSet=utf8mb4;AllowLoadLocalInfile=true;SslMode=none"
},
{
"ConnId": "MYSQL_CasDoor",
"DBType": 0,
"Enabled": true,
"HitRate": 20,
"Connection": "Server=192.168.104.103; Port=3306;SslMode=None;Database=casdoor; Uid=casdoor; Pwd=Vs..127134;CharSet=utf8mb4;AllowLoadLocalInfile=true"
"Connection": "Server=192.168.104.108; Port=3306;SslMode=None;Database=casdoor; Uid=root; Pwd=Vs..127134;CharSet=utf8mb4;AllowLoadLocalInfile=true"
},
{
"ConnId": "WMBLOG_ORACLE",

1
New_College.Model/ViewModels/Result/UniversityResult.cs
View File

@ -155,6 +155,7 @@ namespace New_College.Model.ViewModels
public string collegeCode { get; set; }
public int Rank { get; set; }
/// <summary>
/// 官网
/// </summary>

5
New_College.Model/ViewModels/SelectionResponseDto.cs
View File

@ -14,6 +14,11 @@ namespace New_College.Model
}
public class SelectionMajorDto
{
public string MajorName { get; set; }
}
public class SelectResponseDto
{
public string UniversityName { get; set; }

10
New_College.Services/D_LongIdMapServices.cs
View File

@ -1975,12 +1975,12 @@ namespace New_College.Services
///
/// </summary>
/// <returns></returns>
public async Task<bool> UpdateSchoolScoreLine23(string Location,string subjectType)
public async Task<bool> UpdateSchoolScoreLine23(string Location, string subjectType)
{
var dsQualification = new List<D_QualificationLine>();
var list = await d_PlanMajorScoreLineRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == Location&&e.SubjectType== subjectType);
var list = await d_PlanMajorScoreLineRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == Location && e.SubjectType == subjectType);
//var planlist = await d_PlanMajorDescProRepository.Query(e => e.IsDelete == false && e.Years == 2023 && e.Location == "浙江省");
var universitylist = await d_UniversityRepository.Query();
@ -2181,7 +2181,7 @@ namespace New_College.Services
Phone = university.Phone,
// Nature = university.Nature,
//AscriptionName = university.AscriptionName,
// Rank = university.Rank,
Rank = university.Rank,
AreaName = university.Area_Name,
Logo = university.Logo,
// Syl = university.Syl == 1 ? true : false,
@ -2266,8 +2266,8 @@ namespace New_College.Services
list.Add(models);
});
byte[] byresult = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(list));
_redisCache.Set("sync_university", byresult, TimeSpan.FromDays(1));
//byte[] byresult = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(list));
//_redisCache.Set("sync_university", byresult, TimeSpan.FromDays(1));
return list;
}