解决日报表合并行的对应列不一致的问题

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

@@ -1131,15 +1131,14 @@ public class InterlockDetailHistoryServiceImpl extends ServiceImpl<InterlockDeta
         Row columnRow= sheet.createRow(rowNum++);
         String[] s9 = {"联锁名称", "联锁条件", "仪表状态", "控制系统状态", "旁路状态", "联锁状态", "回路健康级别"};
         // 各列索引
-        int interlockNameCol = 1;
-        int interlockStatusCol = 6;
-        int loopHealthLevelCol = 7;
+        int interlockNameCol = 0;
+        int interlockStatusCol = 5;
+        int loopHealthLevelCol = 6;
         createCellOfRowWithValueStyle(columnRow,s9,cellStyleMap.get("centerAlignStyle"));
 
         //如果有历史数据进行数据合并
         if(exportList.size()!=0){
             // 合并单元格的起始行索引
-            int startTagTimeRow = 0;
             int startInterlockNameRow = 0;
             int startInterlockStatusRow = 0;
             int startLoopHealthLevelRow = 0;