钥匙归还

liujun001
1 parent 241ef253
Showing 1 changed file with 13 additions and 3 deletions
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
@@ -338,7 +338,13 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         List<LinggangKeyWorkLocation> success = new ArrayList<>();
         List<LinggangKeyWorkLocation> error = new ArrayList<>();
         source.forEach(s -> {
-            boolean flag = update(s);
+            boolean flag = false;
+            if(Objects.isNull(s.getId())){
+                flag = save(s);
+            }else{
+               flag = update(s);
+            }
+
             if (flag) {
                 success.add(s);
             } else {
@@ -472,7 +478,9 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         List<LinggangKeyWorkLocation> sources = listRecentDates(dates, keyIds).stream().filter(s -> !Objects.equals(s.getType(), typeEnum.getValue())).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(sources)) {
-            return ResponseResult.error404("无法找到钥匙归还信息");
+            log.info("[{}] 无法找到钥匙归还信息",locations);
+            return ResponseResult.success(locations);
+//            return ResponseResult.error404("无法找到钥匙归还信息");
         }
         if (CollectionUtils.isEmpty(keyInfos)) {
@@ -496,7 +504,9 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         Set<Long> schedulingIds = sources.stream().map(LinggangKeyWorkLocation::getSchedulingId).collect(Collectors.toSet());
         List<LinggangScheduling> schedulings = schedulingService.listByIds(schedulingIds);
         if (CollectionUtils.isEmpty(schedulings)) {
-            return ResponseResult.error404("无法找到排班信息");
+            log.info("[{}] 无法找到钥匙归还信息",locations);
+            return ResponseResult.success(locations);
+//            return ResponseResult.error404("无法找到排班信息");
         }