Merge remote-tracking branch 'origin/develop' into develop

zc-business/src/main/java/com/zc/business/controller/StatusController.java

@@ -53,10 +53,6 @@ public class StatusController extends BaseController {
     public TableDataInfo getTabList(Status status)
     {
         startPage();
-        LocalDateTime todayStart = status.getStartTime().truncatedTo(ChronoUnit.DAYS);
-        LocalDateTime currentTime = status.getTime().truncatedTo(ChronoUnit.DAYS).plusDays(1);
-        status.setStartTime(todayStart);
-        status.setTime(currentTime);
         status.setTypes(status.getType().split(","));
         List<Status> listStatus = statusService.listStatusByTypes(status);
         return getDataTable(listStatus);
@@ -71,13 +67,9 @@ public class StatusController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, Status status)
     {
-        LocalDateTime todayStart = status.getStartTime().truncatedTo(ChronoUnit.DAYS);
-        LocalDateTime currentTime = status.getTime().truncatedTo(ChronoUnit.DAYS).plusDays(1);
-        status.setStartTime(todayStart);
-        status.setTime(currentTime);
         List<Status> listStatus = statusService.export(status);
         ExcelUtil<Status> util = new ExcelUtil<>(Status.class);
-        util.exportExcel(response, listStatus, "【请填写功能名称】数据");
+        util.exportExcel(response, listStatus, "设备状态列表");
     }
 
     //按时间划分设备柱状图