更新

dev-rfid/src/main/java/com/tykj/dev/rfid/controller/RfidController.java

@@ -295,7 +295,11 @@ public class RfidController {
         List<LibraryWarningLog> libraryWarningLogs = libraryWarningLogDao.findAll();
         List<WarningDetailListVo> warningDetailListVos = new ArrayList<>();
         for (LibraryWarningLog libraryWarningLog :libraryWarningLogs) {
-            List<WarningDetailListVo> warningDetails = libraryWarningLogService.getWarningDetail(libraryWarningLog.getId(), null);
+            Boolean isHandle = null;
+            if (warningDetailSelectVo.getWarningHandle()!=null){
+                isHandle = warningDetailSelectVo.getWarningHandle() == 1;
+            }
+            List<WarningDetailListVo> warningDetails = libraryWarningLogService.getWarningDetail(libraryWarningLog.getId(), isHandle);
             warningDetailListVos.addAll(warningDetails);
         }
         SimpleDateFormat sdf =  new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" );
@@ -306,8 +310,8 @@ public class RfidController {
                 Boolean containSeqDim = !hasSeqDim||warningDetailListVo.getDeviceLibraryEntity().getSeqNumber().contains(warningDetailSelectVo.getSeqDim());
                 Boolean containInventoryResultsDim = !hasInventoryResultsDim||warningDetailListVo.getInventoryResults().contains(warningDetailSelectVo.getInventoryResultsDim());
                 Boolean containCreateTimeDim = !hasCreateTimeDim||sdf.format(warningDetailListVo.getCreateTime()).contains(warningDetailSelectVo.getCreateTimeDim());
-                Boolean isHandle = !hasWarningHandle||warningDetailListVo.getWarningHandle().equals(warningDetailSelectVo.getWarningHandle());
-                return containModelDim&&containNameDim&&containSeqDim&&containInventoryResultsDim&&containCreateTimeDim&&isHandle;
+//                Boolean isHandle = !hasWarningHandle||warningDetailListVo.getWarningHandle().equals(warningDetailSelectVo.getWarningHandle());
+                return containModelDim&&containNameDim&&containSeqDim&&containInventoryResultsDim&&containCreateTimeDim;
             }).sorted(Comparator.comparing(WarningDetailListVo::getCreateTime).reversed()).collect(Collectors.toList());
         }
         return ResultUtil.success(PageUtil.getPerPage(warningDetailSelectVo.getPage(),warningDetailSelectVo.getSize(),warningDetailListVos,warningDetailSelectVo.getPageable()));

dev-rfid/src/main/java/com/tykj/dev/rfid/service/impl/LibraryWarningLogServiceImpl.java

@@ -99,6 +99,9 @@ public class LibraryWarningLogServiceImpl implements LibraryWarningLogService {
         if (isHandle != null && isHandle) {
             and.eq("warningHandle", 1);
         }
+        else if (isHandle != null &&!isHandle){
+            and.eq("warningHandle", 0);
+        }
         List<LibraryWarningLogDetail> all = libraryWarningLogDetailDao.findAll(and.build());
         all.stream().forEach(d -> {
             WarningDetailListVo detailVo = new WarningDetailListVo();