[fix]

1.项目合并文件未正确同步的bug以及项目文件资料统计的bug
2.运维监测异常项目列表查询的bug

src/main/java/vion/service/impl/StoreServiceImpl.java

@@ -391,6 +391,10 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
         taskMapper.update(new Task(), Wrappers.lambdaUpdate(Task.class).set(Task::getStoreId, sourceId).set(Task::getAccountId, targetStore.getAccountId()).eq(Task::getStoreId, targetId));
         taskTempService.lambdaUpdate().set(TaskTemp::getStoreId, sourceId).eq(TaskTemp::getStoreId, targetId).update();
         // 所有 targetId 的文件 转移到 sourceId
+        fileService.lambdaUpdate().set(FileInfo::getSourceId, sourceId)
+                .eq(FileInfo::getStoreId, targetId)
+                .in(FileInfo::getSourceType, List.of(1, 24, 25, 26, 27, 28, 29, 30, 31))
+                .update();
         fileService.lambdaUpdate().set(FileInfo::getStoreId, sourceId).eq(FileInfo::getStoreId, targetId).update();
         faultLogService.lambdaUpdate().set(FaultLog::getStoreId, sourceId).eq(FaultLog::getStoreId, targetId).update();
         formService.lambdaUpdate().set(Form::getStoreId, sourceId).set(Form::getAccountId, targetStore.getAccountId()).eq(Form::getStoreId, targetId).update(new Form());
@@ -420,7 +424,7 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
         var fileList = fileService.lambdaQuery()
                 .in(FileInfo::getSourceId, storeIdList)
                 .in(FileInfo::getStoreId, storeIdList)
-                .in(FileInfo::getSourceType, 1, 24, 25, 26, 27, 28)
+                .in(FileInfo::getSourceType, 1, 24, 25, 26, 27, 28, 29, 30, 31)
                 .list();
         var storeId2FileMap = fileList.stream().collect(Collectors.groupingBy(FileInfo::getStoreId, Collectors.groupingBy(FileInfo::getSourceType)));
         return storeIdList.stream().map(storeId -> {
@@ -433,6 +437,9 @@ public class StoreServiceImpl extends MPJBaseServiceImpl<StoreMapper, Store> imp
             map.put("26", fileMap.getOrDefault(26, List.of()).size());
             map.put("27", fileMap.getOrDefault(27, List.of()).size());
             map.put("28", fileMap.getOrDefault(28, List.of()).size());
+            map.put("29", fileMap.getOrDefault(29, List.of()).size());
+            map.put("30", fileMap.getOrDefault(30, List.of()).size());
+            map.put("31", fileMap.getOrDefault(31, List.of()).size());
             return map;
         }).toList();
     }

src/main/java/vion/service/impl/monitor/MallServiceImpl.java

@@ -198,7 +198,7 @@ public class MallServiceImpl extends MPJBaseServiceImpl<MallMapper, Mall> implem
                         .eq(EventRecord::getAgentType, dto.getAgentType())
                         .in(CollUtil.isNotEmpty(dto.getEventUidList()), EventRecord::getEventUid, dto.getEventUidList())
                         .in(CollUtil.isNotEmpty(dto.getAccountUidList()), EventRecord::getAccountUid, dto.getAccountUidList())
-                        .orderByAsc(EventRecord::getMallUid)
+                        .orderByAsc(EventRecord::getMallUid, EventRecord::getEventType)
                         .orderByDesc(EventRecord::getCreateTime))
                 .eq(EventRecord::getStatus, 0);
         var eventRecordList = eventRecordService.selectJoinList(EventRecord.class, eventRecWrapper);