fix 导出

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

@@ -202,8 +202,8 @@ public class InterlockDetailHistoryServiceImpl extends ServiceImpl<InterlockDeta
         Cell titleCell = titleRow.createCell(0);
         titleCell.setCellValue("联锁历史数据报表");
         titleCell.setCellStyle(cellStyleMap.get("firstStyle")); // 第一行的样式
-        // 合并第一行的前4列
-        sheet.addMergedRegion(new CellRangeAddress(rowNum-1, rowNum-1, 0, 3));
+        // 合并第一行的前6列
+        sheet.addMergedRegion(new CellRangeAddress(rowNum-1, rowNum-1, 0, 5));
 
         // 第二行：报表生成时间：
         Row secondTitleRow = sheet.createRow(rowNum++);
@@ -242,7 +242,7 @@ public class InterlockDetailHistoryServiceImpl extends ServiceImpl<InterlockDeta
 
         //第六行：连锁数量、未投用联锁数量、投用率统计
         Row sixTitleRow = sheet.createRow(rowNum++);
-        String[] s6 = {"联锁数量：", String.valueOf(total),"未投用联锁数量：", String.valueOf(wty),"投用率统计：", String.valueOf(tylPercentage)};
+        String[] s6 = {"联锁总数：", String.valueOf(total),"未投用联锁数量：", String.valueOf(wty),"投用率统计：", String.valueOf(tylPercentage)};
         CellStyle[] style6 = {cellStyleMap.get("centerAlignStyle"),cellStyleMap.get("centerAlignStyle3"),cellStyleMap.get("centerAlignStyle"),cellStyleMap.get("centerAlignStyle3"),cellStyleMap.get("centerAlignStyle"),cellStyleMap.get("centerAlignStyle3")};
         createCellOfRowWithValueStyleName(sixTitleRow,s6,style6);
 
@@ -256,7 +256,7 @@ public class InterlockDetailHistoryServiceImpl extends ServiceImpl<InterlockDeta
 
         //第9行：列名
         Row columnRow= sheet.createRow(rowNum++);
-        String[] s9 = {"采集时间", "联锁名称", "联锁条件点位", "仪表状态", "控制系统状态", "旁路状态", "联锁状态", "回路健康级别"};
+        String[] s9 = {"时间", "联锁名称", "联锁条件", "仪表状态", "控制系统状态", "旁路状态", "联锁状态", "回路健康级别"};
         // 各列索引
         int tagTimeCol= 0;
         int interlockNameCol = 1;