feat(自查模块，装备管理模块): 修改库房存放位置，系统自查

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

@@ -645,7 +645,7 @@ public class DeviceLibraryController {
                 deviceLibraryEntity.setType(libraryUpdateVo.getType());
             }
             //add 库房
-            if (libraryUpdateVo.getStorageLocation()!=null){
+            if (libraryUpdateVo.getStorageLocation()!=null && !libraryUpdateVo.getStorageLocation().equals(deviceLibraryEntity.getStorageLocation())){
                 DeviceLogDto deviceLogDto = new DeviceLogDto(deviceEditVo.getDeviceId(), "将存放位置改为"+libraryUpdateVo.getStorageLocation(), null,null,null);
                 deviceLogService.addLog(deviceLogDto);
                 deviceLibraryEntity.setStorageLocation(libraryUpdateVo.getStorageLocation());
@@ -816,14 +816,25 @@ public class DeviceLibraryController {
         List<DeviceLibrary> byIds = deviceLibraryService.findByIds(deviceSelectIdsVo.getIds());
         byIds.forEach(DeviceLibrary::setConfigName);
         //key为所属单位
-        Map<String, List<DeviceLibrary>> map = byIds.stream().collect(Collectors.groupingBy(DeviceLibrary::getOwnUnit));
+        Map<String, List<DeviceLibrary>> map = byIds.stream().collect(Collectors.groupingBy(deviceLibrary -> deviceLibrary.getOwnUnit()+"Ǵ"+deviceLibrary.getIsPart()));
         List<DeviceNewVo> deviceNewVoList = new ArrayList<>();
-        map.forEach((k,v)->{
-            DeviceNewVo deviceNewVo = new DeviceNewVo(v.get(0).getModel(), v.get(0).getName(),
-                    v.get(0).getMatchingRangeName(), v.get(0).getTypeName(),
-                    v.size(),k,DeviceModelSort.toUnitSort(k),v.stream().map(DeviceLibrary::getId).collect(Collectors.toList()));
-            deviceNewVoList.add(deviceNewVo);
-        });
+
+            map.forEach((k,v)->{
+                DeviceNewVo deviceNewVo = new DeviceNewVo(v.get(0).getModel(), v.get(0).getName(),
+                        v.get(0).getMatchingRangeName(), v.get(0).getTypeName(),
+                        v.size(),k.split("Ǵ")[0],DeviceModelSort.toUnitSort(k.split("Ǵ")[0]),v.stream().map(DeviceLibrary::getId).collect(Collectors.toList()),Integer.valueOf(k.split("Ǵ")[1]));
+                deviceNewVoList.add(deviceNewVo);
+            });
+
+
+
+//        List<DeviceNewVo> deviceNewVoList = new ArrayList<>();
+//        map.forEach((k,v)->{
+//            DeviceNewVo deviceNewVo = new DeviceNewVo(v.get(0).getModel(), v.get(0).getName(),
+//                    v.get(0).getMatchingRangeName(), v.get(0).getTypeName(),
+//                    v.size(),k,DeviceModelSort.toUnitSort(k),v.stream().map(DeviceLibrary::getId).collect(Collectors.toList()));
+//            deviceNewVoList.add(deviceNewVo);
+//        });
         //实现按照组织架构排序
         deviceNewVoList.sort(Comparator.comparing(DeviceNewVo::getLevel));
         return deviceNewVoList;

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

@@ -697,13 +697,12 @@ public class SelfCheckController {
     public void findBySystem1() {
         //通过billId和businessType 和 ownUnit
         List<Task>  allByBillAndBusinessTypeAndOwnUnit = taskService.findAllByBillAndBusinessTypeAndOwnUnit(4, userUtils.getCurrentUnitId());
-        if (allByBillAndBusinessTypeAndOwnUnit.size() == 0){
-            throw new ApiException("该时间段没有系统发起的自查");
-        }
-        for (Task task : allByBillAndBusinessTypeAndOwnUnit) {
-            taskService.moveToArchive(task.parse2Bto());
-            //删除
-            selfCheckBillService.delete(task.getBillId());
+        if (allByBillAndBusinessTypeAndOwnUnit.size()>0){
+            for (Task task : allByBillAndBusinessTypeAndOwnUnit) {
+                taskService.moveToArchive(task.parse2Bto());
+                //删除
+                selfCheckBillService.delete(task.getBillId());
+            }
         }
     }