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 d5961d3c1..87662c695 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
@@ -41,9 +41,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -127,9 +130,63 @@ public class LawsWarnService {
                 bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, onlCgformFieldListTemp,null);
                 bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null);
             }
+            //到期前6个月显示红色，到期前12个月显示黄色
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            String newCarTime = String.valueOf(record.get("xin1_che1_xing2_shi2_shi1_ri4_qi1"));
+            String implementTime = String.valueOf(record.get("implement_time"));
+            String currentTime = sdf.format(new Date());
+            if(StringUtils.isNotBlank(newCarTime) && !"null".equals(newCarTime)){
+                try {
+                    if(Integer.parseInt(String.valueOf(parameter.get("flag"))) == 0){
+                        Date newCarTimeDate = sdf.parse(newCarTime);
+                        //当前时间的前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)){
+                            record.put("new_colour","red");
+                        }
+                        if(newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)){
+                            record.put("new_colour","yellow");
+                        }
+                    }
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+            }
+            if(StringUtils.isNotBlank(implementTime) && !"null".equals(implementTime)){
+                try {
+                    if(Integer.parseInt(String.valueOf(parameter.get("flag"))) == 1){
+                        Date newCarTimeDate = 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)){
+                            record.put("implement_colour","red");
+                        }
+                        if(newCarTimeDate.after(parseSix) && newCarTimeDate.before(parseTwelve)){
+                            record.put("implement_colour","yellow");
+                        }
+                    }
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+            }
         }
         return infoPage;
     }
+    private String beforeTime (int month, Date date){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar calendarBefore = Calendar.getInstance();
+        calendarBefore.setTime(date);
+        calendarBefore.add(Calendar.MONTH, month);
+        Date dateBefore = calendarBefore.getTime();
+        String beforeTime = sdf.format(dateBefore);
+        return beforeTime;
+    }
 
     public void exportExcel(Map<String, Object> map, HttpServletResponse response, HttpServletRequest request) {
         String cut = (String) map.get("cut");