[fix] 设备返修消息推送修改推送字段值

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

@@ -944,7 +944,7 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
         log.info("合同编号验证：{}", JsonUtil.createObj().putPOJO("unsynced", unsyncedList).putPOJO("extra", extraList));
         log.info("合同编号验证：{}", JsonUtil.createObj().putPOJO("unsynced", unsyncedList).putPOJO("extra", extraList));
         var sameList = CollUtil.intersectionDistinct(dataIdSet, contractNoList);
         var sameList = CollUtil.intersectionDistinct(dataIdSet, contractNoList);
         // 只比对合同编号SC开头的合同
         // 只比对合同编号SC开头的合同
-        contractDiff(sameList.stream().filter(no -> StrUtil.startWith(no, "SC")).collect(Collectors.toSet()));
+        contractDiff(sameList.stream().filter(no -> StrUtil.startWith(no, "SC")).sorted(String::compareTo).collect(Collectors.toCollection(LinkedHashSet::new)));
         log.info("合同比对结束");
         log.info("合同比对结束");
     }
     }
 
 

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

@@ -136,7 +136,7 @@ public class RepairRecServiceImpl extends MPJBaseServiceImpl<RepairRecMapper, Re
         var repairRecVO = this.selectJoinOne(RepairRecVO.class, wrapper);
         var repairRecVO = this.selectJoinOne(RepairRecVO.class, wrapper);
 
 
         var deviceNoStr = Opt.ofEmptyAble(repairRecVO.getRepairDeviceList())
         var deviceNoStr = Opt.ofEmptyAble(repairRecVO.getRepairDeviceList())
-                .map(l -> l.stream().map(RRepairDevice::getDeviceNo).collect(Collectors.joining(",")))
+                .map(l -> l.stream().map(RRepairDevice::getOriginDeviceNo).collect(Collectors.joining(",")))
                 .orElse("暂无");
                 .orElse("暂无");
 
 
         var jsonObj = JsonUtil.createObj()
         var jsonObj = JsonUtil.createObj()