zhc077
/
hnjd_comp
forked from wangjiadong/comp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

首页面BUG

Browse Source
main
Gitea 4 months ago
parent 70e6db0842
commit 253ee8316f
1 changed files with 49 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 69
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java

69
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
Unescape View File

@ -1264,21 +1264,36 @@ public class AnnualCompetitionProjectRegistrationController {
map2.put("xmid",listacp.get(k).getId()); map2.put("xmid",listacp.get(k).getId());
//状态 //状态
Date date = new Date(); Date date = new Date();
if(date.getTime()>=listacp.get(k).getApplyStartTime().getTime()&&date.getTime()<=listacp.get(k).getApplyEndTime().getTime()){ if(listacp.get(k).getApplyStartTime()!=null&&listacp.get(k).getApplyEndTime()!=null){
map2.put("zt","报名"); if(date.getTime()>=listacp.get(k).getApplyStartTime().getTime()&&date.getTime()<=listacp.get(k).getApplyEndTime().getTime()){
map2.put("zt","报名");
}
} }
if(date.getTime()>=listacp.get(k).getTopicStartTime().getTime()&&date.getTime()<=listacp.get(k).getTopicEndTime().getTime()){
map2.put("zt","选题"); if(listacp.get(k).getTopicStartTime()!=null&&listacp.get(k).getTopicEndTime()!=null){
if(date.getTime()>=listacp.get(k).getTopicStartTime().getTime()&&date.getTime()<=listacp.get(k).getTopicEndTime().getTime()){
map2.put("zt","选题");
}
} }
if(date.getTime()>=listacp.get(k).getUploadStartTime().getTime()&&date.getTime()<=listacp.get(k).getUploadEndTime().getTime()){
map2.put("zt","上传作品"); if(listacp.get(k).getUploadStartTime()!=null&&listacp.get(k).getUploadEndTime()!=null){
if(date.getTime()>=listacp.get(k).getUploadStartTime().getTime()&&date.getTime()<=listacp.get(k).getUploadEndTime().getTime()){
map2.put("zt","上传作品");
}
} }
if(date.getTime()>=listacp.get(k).getScoreStartTime().getTime()&&date.getTime()<=listacp.get(k).getScoreEndTime().getTime()){
map2.put("zt","评分"); if(listacp.get(k).getScoreStartTime()!=null&&listacp.get(k).getScoreEndTime()!=null){
if(date.getTime()>=listacp.get(k).getScoreStartTime().getTime()&&date.getTime()<=listacp.get(k).getScoreEndTime().getTime()){
map2.put("zt","评分");
}
} }
if(date.getTime()>listacp.get(k).getScoreEndTime().getTime()){
map2.put("zt","已结束"); if(listacp.get(k).getScoreEndTime()!=null){
if(date.getTime()>listacp.get(k).getScoreEndTime().getTime()){
map2.put("zt","已结束");
}
} }
xmListMap.add(map2); xmListMap.add(map2);
} }
}else { }else {
@ -1292,20 +1307,34 @@ public class AnnualCompetitionProjectRegistrationController {
map3.put("xmid",listacp.get(o).getId()); map3.put("xmid",listacp.get(o).getId());
//状态 //状态
Date date = new Date(); Date date = new Date();
if(date.getTime()>=listacp.get(o).getApplyStartTime().getTime()&&date.getTime()<=listacp.get(o).getApplyEndTime().getTime()){ if(listacp.get(o).getApplyStartTime()!=null&&listacp.get(o).getApplyEndTime()!=null){
map3.put("zt","报名"); if(date.getTime()>=listacp.get(o).getApplyStartTime().getTime()&&date.getTime()<=listacp.get(o).getApplyEndTime().getTime()){
map3.put("zt","报名");
}
} }
if(date.getTime()>=listacp.get(o).getTopicStartTime().getTime()&&date.getTime()<=listacp.get(o).getTopicEndTime().getTime()){
map3.put("zt","选题"); if(listacp.get(o).getTopicStartTime()!=null&&listacp.get(o).getTopicEndTime()!=null){
if(date.getTime()>=listacp.get(o).getTopicStartTime().getTime()&&date.getTime()<=listacp.get(o).getTopicEndTime().getTime()){
map3.put("zt","选题");
}
} }
if(date.getTime()>=listacp.get(o).getUploadStartTime().getTime()&&date.getTime()<=listacp.get(o).getUploadEndTime().getTime()){
map3.put("zt","上传作品"); if(listacp.get(o).getUploadStartTime()!=null&&listacp.get(o).getUploadEndTime()!=null){
if(date.getTime()>=listacp.get(o).getUploadStartTime().getTime()&&date.getTime()<=listacp.get(o).getUploadEndTime().getTime()){
map3.put("zt","上传作品");
}
} }
if(date.getTime()>=listacp.get(o).getScoreStartTime().getTime()&&date.getTime()<=listacp.get(o).getScoreEndTime().getTime()){
map3.put("zt","评分"); if(listacp.get(o).getScoreStartTime()!=null&&listacp.get(o).getScoreEndTime()!=null){
if(date.getTime()>=listacp.get(o).getScoreStartTime().getTime()&&date.getTime()<=listacp.get(o).getScoreEndTime().getTime()){
map3.put("zt","评分");
}
} }
if(date.getTime()>listacp.get(o).getScoreEndTime().getTime()){
map3.put("zt","已结束"); if(listacp.get(o).getScoreEndTime()!=null){
if(date.getTime()>listacp.get(o).getScoreEndTime().getTime()){
map3.put("zt","已结束");
}
} }
xmListMap.add(map3); xmListMap.add(map3);
} }

Write Preview
Loading…
Cancel
Save