修改历史数据导出合并数据问题

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

@@ -685,16 +685,16 @@ public class InterlockDetailHistoryServiceImpl extends ServiceImpl<InterlockDeta
                     startInterlockNameRow = rowNum;
                 }
 
-                // 合并 "联锁状态" 列单元格，基于 "采集时间"
-                if (idx == 0 || !record.getTagTime().equals(exportList.get(idx - 1).getTagTime()) || !record.getInterlockname().equals(exportList.get(idx - 1).getInterlockname())) {
+                // 合并 "联锁状态" 列单元格，基于 "采集时间" "联锁名称"
+                if (idx == 0 || !record.getTagTime().equals(exportList.get(idx - 1).getTagTime()) || !record.getInterlockname().equals(exportList.get(idx - 1).getInterlockname()) || !record.getInterlockStatusName().equals(exportList.get(idx - 1).getInterlockStatusName())) {
                     if (idx > 0 && (rowNum - startInterlockStatusRow) > 1) {
                         sheet.addMergedRegion(new CellRangeAddress(startInterlockStatusRow, rowNum - 1, interlockStatusCol, interlockStatusCol));
                     }
                     startInterlockStatusRow = rowNum;
                 }
 
-                // 合并 "回路健康状态" 列单元格，基于 "采集时间"
-                if (idx == 0 || !record.getTagTime().equals(exportList.get(idx - 1).getTagTime()) || !record.getInterlockname().equals(exportList.get(idx - 1).getInterlockname())) {
+                // 合并 "回路健康状态" 列单元格，基于 "采集时间" "联锁名称"
+                if (idx == 0 || !record.getTagTime().equals(exportList.get(idx - 1).getTagTime()) || !record.getInterlockname().equals(exportList.get(idx - 1).getInterlockname()) || !record.getLoopHealthLevel().equals(exportList.get(idx - 1).getLoopHealthLevel())) {
                     if (idx > 0 && (rowNum - startLoopHealthLevelRow) > 1) {
                         sheet.addMergedRegion(new CellRangeAddress(startLoopHealthLevelRow, rowNum - 1, loopHealthLevelCol, loopHealthLevelCol));
                     }