feat(统计模块): 增加备注

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

@@ -1295,6 +1295,20 @@ public class DeviceLibraryController {
     }
 
 
+    @Transactional(rollbackFor = Exception.class)
+    @GetMapping("/compare")
+    @ApiOperation(value = "查看脏数据")
+    public ResponseEntity<List<DeviceLibrary>> compareData(){
+        Integer unitId = userUtils.getCurrentUnitId();
+        List<DeviceLibrary> deviceLibraries = deviceLibraryService.getDeviceByUnitNameAll(unitId);
+        DeviceLibrarySelectVo deviceLibrarySelectVo = new DeviceLibrarySelectVo();
+        deviceLibrarySelectVo.setAreaId(2);
+        List<DeviceLibrary> coreDevicePage = deviceLibraryService.getCoreDevicePage(deviceLibrarySelectVo);
+        deviceLibraries.removeAll(coreDevicePage);
+        return ResponseEntity.ok(coreDevicePage);
+    }
+
+
 //    @ApiOperation(value = "修改单位名称", notes = "修改单位名称")
 //    @PostMapping("/updateDeviceLocationAndOwnUnit")
 //    @Transactional(rollbackFor = Exception.class)

dev-statistical/src/main/java/com/tykj/dev/statistical/service/impl/StatisticalServiceImpl.java

@@ -547,6 +547,7 @@ public class StatisticalServiceImpl implements StatisticalService {
         workBench.setDailyDeviceNum(Long.valueOf(deviceLibraries.stream().filter(deviceLibrary ->
                 deviceLibrary.getOwnUnit().equals(unitName)&&Arrays.asList(2,14).contains(deviceLibrary.getLifeStatus()))
                 .count()).intValue());
+
         List<Task> allTasks = taskDao.findAll();
         List<Task> tasks = allTasks.stream().filter(task -> task.getBusinessType()==7).collect(Collectors.toList());
         List<Task> tasks2 = allTasks.stream().filter(task -> task.getBusinessType()==4).collect(Collectors.toList());

dev-statistical/src/main/java/com/tykj/dev/statistical/vo/WorkBench.java

@@ -15,10 +15,19 @@ public class WorkBench {
 
     private Integer packingNum;
 
+    /**
+     * 全省装备库
+     */
     private Integer allDeviceNum;
 
+    /**
+     * 省级装备库
+     */
     private Integer selfDeviceNum;
 
+    /**
+     * 本级管理库
+     */
     private Integer dailyDeviceNum;
 
     private Integer matchingDeviceNum;