diff --git a/New_College.Api/Controllers/Front/SeVolunteerInitializationController.cs b/New_College.Api/Controllers/Front/SeVolunteerInitializationController.cs index 53a6d71..9cb2330 100644 --- a/New_College.Api/Controllers/Front/SeVolunteerInitializationController.cs +++ b/New_College.Api/Controllers/Front/SeVolunteerInitializationController.cs @@ -53,74 +53,34 @@ namespace New_College.Api.Controllers Code = sysregion.Where(e => e.RegionName == c.ProvinceName).FirstOrDefault().RegionCode }).ToList(); - - - int nowyear = DateTime.Now.Year; - int month = DateTime.Now.Month; + DateTime dt = DateTime.Now; + DateTime fixedDate = new DateTime(dt.Year, 9, 1); // 创建当前年份的9月10日 + int nowyear = dt > fixedDate ? dt.Year + 1 : dt.Year; // 比较当前日期与固定日期 sevolunterlist.ForEach(a => { + var list = new List(); - if (month < 8)//大于8月份则高考时间已过,为往届高考生 + + list.Add(new LizationDto() { - //list.Add(new LizationDto() - //{ - // name = (nowyear - 1).ToString(), - // code = nowyear - 1, - // Policy = nowyear - 1 < a.Years ? 0 : a.Policy + name = nowyear.ToString() + "(现高三)", + code = nowyear, + Policy = nowyear < a.Years ? 0 : a.Policy - //}); - 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 - }); - - } - else + }); + list.Add(new LizationDto() { - list.Add(new LizationDto() - { - name = (nowyear).ToString(), - code = nowyear, - Policy = nowyear < a.Years ? 0 : a.Policy + name = (nowyear - 1).ToString() + "(现高二)", + code = nowyear - 1, + Policy = nowyear - 1 < 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 - }); - } + }); + list.Add(new LizationDto() + { + name = (nowyear - 2).ToString() + "(现高一)", + code = nowyear - 2, + Policy = nowyear - 2 < a.Years ? 0 : a.Policy + }); a.lizations = list; });