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

调整计算逻辑

develop
old易 2024-10-28 14:38:18 +08:00
parent 8a9576a9a8
commit 7f5b7f46d9
1 changed files with 21 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
New_College.Api/Controllers/Front/SeVolunteerInitializationController.cs
View File

@ -53,22 +53,14 @@ namespace New_College.Api.Controllers
Code = sysregion.Where(e => e.RegionName == c.ProvinceName).FirstOrDefault().RegionCode Code = sysregion.Where(e => e.RegionName == c.ProvinceName).FirstOrDefault().RegionCode
}).ToList(); }).ToList();
DateTime dt = DateTime.Now;
DateTime fixedDate = new DateTime(dt.Year, 9, 1); // 创建当前年份的9月10日
int nowyear = DateTime.Now.Year; int nowyear = dt > fixedDate ? dt.Year + 1 : dt.Year; // 比较当前日期与固定日期
int month = DateTime.Now.Month;
sevolunterlist.ForEach(a => sevolunterlist.ForEach(a =>
{ {
var list = new List<LizationDto>();
if (month < 8)//大于8月份则高考时间已过，为往届高考生
{
//list.Add(new LizationDto()
//{
// name = (nowyear - 1).ToString(),
// code = nowyear - 1,
// Policy = nowyear - 1 < a.Years ? 0 : a.Policy
//}); var list = new List<LizationDto>();
list.Add(new LizationDto() list.Add(new LizationDto()
{ {
name = nowyear.ToString() + "(现高三)", name = nowyear.ToString() + "(现高三)",
@ -78,49 +70,17 @@ namespace New_College.Api.Controllers
}); });
list.Add(new LizationDto() list.Add(new LizationDto()
{ {
name = (nowyear + 1).ToString() + "(现高二)", name = (nowyear - 1).ToString() + "(现高二)",
code = nowyear + 1, code = nowyear - 1,
Policy = nowyear + 1 < a.Years ? 0 : a.Policy Policy = nowyear - 1 < a.Years ? 0 : a.Policy
}); });
list.Add(new LizationDto() list.Add(new LizationDto()
{ {
name = (nowyear + 2).ToString() + "(现高一)", name = (nowyear - 2).ToString() + "(现高一)",
code = nowyear + 2, code = nowyear - 2,
Policy = nowyear + 2 < a.Years ? 0 : a.Policy Policy = nowyear - 2 < a.Years ? 0 : a.Policy
}); });
}
else
{
list.Add(new LizationDto()
{
name = (nowyear).ToString(),
code = nowyear,
Policy = nowyear < a.Years ? 0 : a.Policy
});
list.Add(new LizationDto()
{
name = (nowyear + 1).ToString() + "(现高三)",
code = nowyear + 1,
Policy = nowyear + 1 < a.Years ? 0 : a.Policy
});
list.Add(new LizationDto()
{
name = (nowyear + 2).ToString() + "(现高二)",
code = nowyear + 2,
Policy = nowyear + 2 < a.Years ? 0 : a.Policy
});
list.Add(new LizationDto()
{
name = (nowyear + 3).ToString() + "(现高一)",
code = nowyear + 3,
Policy = nowyear + 3 < a.Years ? 0 : a.Policy
});
}
a.lizations = list; a.lizations = list;
}); });