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

bug fixed

develop
old易 2024-03-01 14:51:26 +08:00
parent 99901ec2a0
commit dc791b849b
7 changed files with 62 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
New_College.Api/Controllers/Back/PlanMajorScoreLineController.cs
View File

@ -230,6 +230,7 @@ namespace New_College.Api.Controllers
}
Expression<Func<D_PlanMajorScoreLine, bool>> expression = Expressionable.Create<D_PlanMajorScoreLine>()
.And(c => c.UId == request.Uid)
.And(c => c.IsDelete == false)
.AndIF(!string.IsNullOrWhiteSpace(request.BatchName), c => c.BatchName == request.BatchName)
.AndIF(request.Year.HasValue && request.Year > 0, c => c.Years == request.Year)
.ToExpression();

2
New_College.Api/Controllers/Front/UniversityRankController.cs
View File

@ -46,7 +46,7 @@ namespace New_College.Api.Controllers
status = 200
};
}
string years = DateTime.Now.Year.ToString();
string years = (DateTime.Now.Year-1).ToString();
var query = await _UniversityRankRepository.Query(c => c.Year == years && c.UniversityName == single.UniversityName);
return new MessageModel<List<SingleUniversityResponseView>> ()
{

8
New_College.Api/New_College.xml
View File

@ -252,6 +252,14 @@
<param name="login"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.CustomerController.DistrFanc(System.Int32,System.Int32)">
<summary>
增加粉丝
</summary>
<param name="saleId"></param>
<param name="fancId"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.CustomerController.updatesync(System.String)">
<summary>
同步合并数据

15
New_College.Repository/BASE/D_PlanMajorDescProRepository.cs
View File

@ -24,6 +24,21 @@ namespace New_College.Repository
}
/// <summary>
///
/// </summary>
/// <param name="majorDescs"></param>
/// <returns></returns>
public async Task<bool> Batchupdate(List<D_PlanMajorDescPro> majorDescs)
{
// int k = this.Db.Updateable(majorDescs).ExecuteCommand();
// this.Db.Fastest<D_PlanMajorDesc>().BulkUpdate(GetList()) //适合大批量更新
var kk = await this.Db.Fastest<D_PlanMajorDescPro>().BulkUpdateAsync(majorDescs);
return kk > 0;
}
public async Task<PageModel<UniversityPlanProView>> GetUniversityPlanPro(UniversityProViewQuery request)
{
RefAsync<int> totalCount = 0;

3
New_College.Repository/BASE/ID_PlanMajorDescProRepository.cs
View File

@ -2,6 +2,7 @@
using New_College.Model;
using New_College.Model.Models;
using New_College.Model.ViewModels;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace New_College.IRepository
@ -12,5 +13,7 @@ namespace New_College.IRepository
public interface ID_PlanMajorDescProRepository : IBaseRepository<D_PlanMajorDescPro>
{
Task<PageModel<UniversityPlanProView>> GetUniversityPlanPro(UniversityProViewQuery request);
Task<bool> Batchupdate(List<D_PlanMajorDescPro> majorDescs);
}
}

61
New_College.Services/D_LongIdMapServices.cs
View File

@ -860,19 +860,14 @@ namespace New_College.Services
/// <returns></returns>
public async Task<List<NewPlanDescList>> GetPlanBySchollId(PlanQuery query)
{
Expression<Func<D_PlanMajorDesc, bool>> whereexp = Expressionable.Create<D_PlanMajorDesc>() //创建表达式
Expression<Func<D_PlanMajorDescPro, bool>> whereexp = Expressionable.Create<D_PlanMajorDescPro>() //创建表达式
.And(c => c.IsDelete == false)
.AndIF(!string.IsNullOrEmpty(query.AreaName), c => c.Location == query.AreaName)
.And(c => c.UId == query.UnviersityId)
.AndIF(!string.IsNullOrEmpty(query.BatchName), c => c.BatchName == query.BatchName)
.AndIF(query.Year > 0, c => c.Years == query.Year)
.ToExpression();
////var check = await t_EnrollmentBatchRepository.Query(x => x.Type == query.Type && x.Year == query.Year && x.Batch_name == query.BatchName && x.AreaName == query.AreaName);
////if (check.Count <= 0)
//var check = await d_PlanMajorDescRepository.Query(x => x.Years == query.Year && x.BatchName == query.BatchName && x.Location == query.AreaName);
//if (check.Count <= 0)
// return new List<NewPlanDescList>() { };
// var batchid = check.Select(x => x.Id)?.FirstOrDefault();
var info = await d_PlanMajorDescRepository.Query(whereexp);
var info = await d_PlanMajorDescProRepository.Query(whereexp);
List<NewPlanDescList> list = new List<NewPlanDescList>() { };
foreach (var item in info)
{
@ -1073,7 +1068,7 @@ namespace New_College.Services
};
}
#region 数据导入
@ -2030,30 +2025,38 @@ namespace New_College.Services
#endregion
//var universitylist=await un
#region 更新专业计划信息
//var plist = await this._PlanMajorDescRepository.Query(c => c.Location == "山东省" && c.Years == 2023 && c.IsDelete == false && c.UId <= 0);
//plist.ForEach(p =>
//{
// var newmodel = tbinfo.Where(e => e.EnrollmentCode == p.EnrollmentCode && e.MajorCode == p.MajorCode).FirstOrDefault();
// if (newmodel != null)
// {
// p.CityName = newmodel.City;
// p.EducationCategory = newmodel.EducationCategory;
// // p.EnrollmentCode = newmodel.EnrollmentCode;
// p.EnrollmentType = newmodel.EnrollmentType;
// //p.SchoolType=newmodel.sch
// p.FirstType = newmodel.FirstType;
// p.Nature = newmodel.Nature;
// p.Ownership = newmodel.Ownership;
// p.LowScore = int.Parse(newmodel._23Score);
// p.LowScoreRank = int.Parse(newmodel._23ScoreLine);
var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == "山东省" && c.Years == 2023 && c.IsDelete == false && c.UId <= 0);
plist.ForEach(p =>
{
var newmodel = tbinfo.Where(e => (e.EnrollmentCode == p.EnrollmentCode || e.UniversityName == p.UniversityName) && e.MajorCode == p.MajorCode).FirstOrDefault();
if (newmodel != null)
{
p.CityName = newmodel.City;
p.EducationCategory = newmodel.EducationCategory;
// p.EnrollmentCode = newmodel.EnrollmentCode;
p.EnrollmentType = newmodel.EnrollmentType;
//p.SchoolType=newmodel.sch
p.FirstType = newmodel.FirstType;
p.Nature = newmodel.Nature;
p.Ownership = newmodel.Ownership;
p.NewCount = int.Parse(newmodel._23Count) - int.Parse(newmodel._22Count);
p.PlanCount = int.Parse(newmodel._23Count);
p.LowScore = int.Parse(newmodel._23Score);
p.LowScoreRank = int.Parse(newmodel._23ScoreLine);
// }
}
//});
});
//await this._PlanMajorDescRepository.Batchupdate(plist);
await this.d_PlanMajorDescProRepository.Batchupdate(plist);
#endregion
@ -2079,7 +2082,7 @@ namespace New_College.Services
return true;
}

4
New_College.Services/D_PlanMajorDescServices.cs
View File

@ -243,8 +243,8 @@ namespace New_College.Services
c._frank = items.Min(e => int.Parse(e._23SchoolScoreLine));
c._sscore = items.Min(e => int.Parse(e._22Score));
c._srank = items.Min(e => int.Parse(e._22ScoreLine));
c._tscore = items.Min(e => int.Parse(e._22Score));
c._trank = items.Min(e => int.Parse(e._22ScoreLine));
c._tscore = items.Min(e => int.Parse(e._21Score));
c._trank = items.Min(e => int.Parse(e._21ScoreLine));
}
c.iGoPlanMajorItems = items.Select(t => new AIGoPlanMajorItem()
{