日报表保存数据取消

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/service/impl/InterlockDetailHistoryServiceImpl.java

@@ -521,7 +521,7 @@ public class InterlockDetailHistoryServiceImpl extends ServiceImpl<InterlockDeta
         SXSSFWorkbook workbook = new SXSSFWorkbook();
         Map<String,CellStyle> cellStyleMap = getCellStyle(workbook);
         //判断日报表当天是否存过数据
-        Boolean isSaveDay = summaryDayService.getIsExistDataCurr();
+//        Boolean isSaveDay = summaryDayService.getIsExistDataCurr();
         if (zzxtvoList != null) {
             for (InterlockHistoryDistinctZZXTVO zzxtvo : zzxtvoList) {
                 if(dto.getBeginTime()==null && "1".equals(type)){
@@ -533,7 +533,7 @@ public class InterlockDetailHistoryServiceImpl extends ServiceImpl<InterlockDeta
                     if(maxTagTime!=null) dto.setEndTime(maxTagTime);
                 }
                 String sheetName =generateSheetName(zzxtvo) ;
-                processSheet2(workbook, cellStyleMap, sheetName, dto, zzxtvo,type, isSaveDay);
+                processSheet2(workbook, cellStyleMap, sheetName, dto, zzxtvo,type);
             }
         }
         return workbook;
@@ -743,7 +743,7 @@ public class InterlockDetailHistoryServiceImpl extends ServiceImpl<InterlockDeta
     }
 
     //该段日报表取的当前时刻数据是从联锁总表中获取的
-    private SXSSFWorkbook processSheet2(SXSSFWorkbook workbook, Map<String,CellStyle> cellStyleMap, String sheetName, InterlockHistoryQueryDTO dto, InterlockHistoryDistinctZZXTVO zzxtvo,String type, Boolean isSaveDay) throws IOException {
+    private SXSSFWorkbook processSheet2(SXSSFWorkbook workbook, Map<String,CellStyle> cellStyleMap, String sheetName, InterlockHistoryQueryDTO dto, InterlockHistoryDistinctZZXTVO zzxtvo,String type) throws IOException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String formattedBeginTime = dto.getBeginTime() != null ? sdf.format(dto.getBeginTime()) : "";
         String formattedEndTime = dto.getEndTime() != null ? sdf.format(dto.getEndTime()) : "";
@@ -759,7 +759,7 @@ public class InterlockDetailHistoryServiceImpl extends ServiceImpl<InterlockDeta
             exportList = InterlockSummaryHistoryConvert.INSTANCE.toHistoryDayList(interlockSummaryDayVOList);
             //计算投用率 数据是按点位时间和联锁名称排序的，当名称不一样时，代表是下一个联锁,查看一下投用
             String interlockname = "";
-            List<InterlockSummaryDay> interlockSummaryDays = new ArrayList<>();//存放日报表总表数据
+//            List<InterlockSummaryDay> interlockSummaryDays = new ArrayList<>();//存放日报表总表数据
             for(InterlockSummaryHistoryVO interlockSummaryHistoryVO:exportList){
                 if(!interlockname.equals(interlockSummaryHistoryVO.getInterlockname())){
                     interlockname = interlockSummaryHistoryVO.getInterlockname();
@@ -768,10 +768,10 @@ public class InterlockDetailHistoryServiceImpl extends ServiceImpl<InterlockDeta
                     }else{
                         wty++;
                     }
-                    interlockSummaryDays.add(InterlockSummaryHistoryConvert.INSTANCE.toSummaryDay(interlockSummaryHistoryVO));
+//                    interlockSummaryDays.add(InterlockSummaryHistoryConvert.INSTANCE.toSummaryDay(interlockSummaryHistoryVO));
                 }
             }
-            if(interlockSummaryDays.size()!=0 && !isSaveDay) summaryDayService.saveBatch(interlockSummaryDays);
+//            if(interlockSummaryDays.size()!=0 && !isSaveDay) summaryDayService.saveBatch(interlockSummaryDays);
 //            //获取所有联锁数据用于写入日报表
 //            exportList = this.getForExport00(dto);
         }else {//手动导出、月报表、年报表相关