UPDATE: 1、子计划管理，筛选条件改成搜索、设备厂家、是否分配；

2、重复导入子计划时，增量被检设备并删除未检设备。

detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java

@@ -1616,7 +1616,12 @@ public class ResultServiceImpl implements IResultService {
 
         List<PqMonitor> pqMonitorList = pqMonitorService.lambdaQuery().eq(PqMonitor::getDevId, devId).isNotNull(PqMonitor::getResultType).list();
         List<MonitorResultVO> list = new ArrayList<>();
+        if (CollUtil.isEmpty(pqMonitorList)) {
+            return list;
+        }
         MonitorResultVO result;
+        // 根据通道号排序
+        pqMonitorList.sort(Comparator.comparing(PqMonitor::getNum));
         for (PqMonitor pqMonitor : pqMonitorList) {
             result = new MonitorResultVO();
             result.setMonitorId(pqMonitor.getDevId() + CnSocketUtil.SPLIT_TAG + pqMonitor.getNum());