diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index 87662c695..9c43e54a2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -144,10 +144,10 @@ public class LawsWarnService { String beforeTimeTwelve = beforeTime(12,new Date()); Date parseSix = sdf.parse(beforeTimeSix); Date parseTwelve = sdf.parse(beforeTimeTwelve); - if(newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)){ + if((newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)) || newCarTime.equals(beforeTimeSix)){ record.put("new_colour","red"); } - if(newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)){ + if((newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)) || newCarTime.equals(beforeTimeTwelve)){ record.put("new_colour","yellow"); } } @@ -158,16 +158,16 @@ public class LawsWarnService { if(StringUtils.isNotBlank(implementTime) && !"null".equals(implementTime)){ try { if(Integer.parseInt(String.valueOf(parameter.get("flag"))) == 1){ - Date newCarTimeDate = sdf.parse(implementTime); + Date implementTimeDate = sdf.parse(implementTime); //当前时间的前6个月 String beforeTimeSix = beforeTime(6,new Date()); String beforeTimeTwelve = beforeTime(12,new Date()); Date parseSix = sdf.parse(beforeTimeSix); Date parseTwelve = sdf.parse(beforeTimeTwelve); - if(newCarTimeDate.after(new Date()) && newCarTimeDate.before(parseSix)){ + if((implementTimeDate.after(new Date()) && implementTimeDate.before(parseSix)) || implementTime.equals(beforeTimeSix)){ record.put("implement_colour","red"); } - if(newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)){ + if((implementTimeDate.after(parseSix) && implementTimeDate.before(parseTwelve)) || implementTime.equals(beforeTimeTwelve)){ record.put("implement_colour","yellow"); } }