|
@@ -245,15 +245,15 @@ public class SchoolService {
|
245
|
245
|
//获取当前学校的学年
|
246
|
246
|
int year = schoolMapper.getYearById(schoolid);
|
247
|
247
|
|
248
|
|
- Integer nowYear = N_Utils.getNodeDateTime("year");//当前年份
|
|
248
|
+ //前端进行年份判断
|
|
249
|
+ /*Integer nowYear = N_Utils.getNodeDateTime("year");//当前年份
|
249
|
250
|
//如果学校年份大于等于当前年份无需升级
|
250
|
251
|
if(year >= nowYear){
|
251
|
252
|
isup = false;
|
252
|
|
- }
|
|
253
|
+ }*/
|
253
|
254
|
|
254
|
255
|
rtnMap.put("isup",isup);
|
255
|
256
|
rtnMap.put("year",year);
|
256
|
|
- rtnMap.put("upyear",(year + 1));//学年升级之后年份
|
257
|
257
|
rtnMap.put("starttime",cloud.getStarttime());
|
258
|
258
|
rtnMap.put("stoptime",cloud.getStoptime());
|
259
|
259
|
return rtnMap;
|