更新

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java

@@ -197,11 +197,14 @@ public class DeviceLibraryController {
         }
         Page<DeviceVo> deviceLibraryEntities = PageUtil.getPerPage(deviceLibrarySelectVo.getPage(), deviceLibrarySelectVo.getSize(), resultList, deviceLibrarySelectVo.getPageable());
         Map<String,Object> map = new HashMap<>();
+        Map<Integer,String> lifeStatusMap = configCache.getLifeStatusMap();
+        Set<Integer> status = resultList.stream().map(DeviceVo::getLifeStatus).collect(Collectors.toSet());
         map.put("pages",deviceLibraryEntities);
         map.put("models",resultList.stream().map(DeviceVo::getModel).collect(Collectors.toSet()));
         map.put("names",resultList.stream().map(DeviceVo::getName).collect(Collectors.toSet()));
         map.put("ownUnits",resultList.stream().map(DeviceVo::getOwnUnit).collect(Collectors.toSet()));
         map.put("locationUnits",resultList.stream().map(DeviceVo::getLocationUnit).collect(Collectors.toSet()));
+        map.put("lifeStatus",status.stream().map(integer -> new LifeStatusVo(integer,lifeStatusMap.get(integer))).collect(Collectors.toList()));
         return ResultUtil.success(map);
     }
 

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java

@@ -406,7 +406,14 @@ public class SelfCheckController {
             //阅知
             List<Integer> idList = new ArrayList<>();
             idList.add(selfCheckConfirmVo.getUserbId());
-            MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "完成终端自查", idList, 0);
+            String content;
+            if ("扫码".equals(taskBto.getCustomInfo())) {
+                content = "完成终端自查";
+            }
+            else {
+                content = "完成手动自查";
+            }
+            MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), content, idList, 0);
             messageService.add(messageBto);
             for (String s:strings) {
                 if (s.length()>=2) {