提交 aa54cba3 authored 作者: zhoushaopan's avatar zhoushaopan

fix(装备列装模块): 修改阅知bug

修改阅知bug
上级 2f5847dd
...@@ -990,8 +990,10 @@ public class PackingController { ...@@ -990,8 +990,10 @@ public class PackingController {
// //
// } // }
// ); // );
MessageBto messageBto = new MessageBto(0,1,"修改"+packingLibraryUpdateVo.getModel()+"列装信息:原"+mapToString(originalMap)+"-->现"+mapToString(nowMap),userIds,0); if(nowMap.size()>0) {
MessageBto messageBto = new MessageBto(0, 1, "修改" + packingLibraryUpdateVo.getModel() + "列装信息:原" + mapToString(originalMap) + "-->现" + mapToString(nowMap), userIds, 0);
messageService.add(messageBto); messageService.add(messageBto);
}
return ResponseEntity.ok("编辑成功"); return ResponseEntity.ok("编辑成功");
} }
......
...@@ -973,6 +973,8 @@ public class PackingLibraryServiceImpl implements PackingLibraryService { ...@@ -973,6 +973,8 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
public void relievePacking(PackingLibrary packingLibrary) { public void relievePacking(PackingLibrary packingLibrary) {
//获取列装对象的装备 //获取列装对象的装备
if (packingLibrary.getIsPart() == 1) {
//说明是附件目录
List<DeviceLibrary> deviceLibraries = deviceLibraryService.findAllByPackingId(packingLibrary.getId()); List<DeviceLibrary> deviceLibraries = deviceLibraryService.findAllByPackingId(packingLibrary.getId());
List<Integer> deviceIds = deviceLibraries.stream().map(DeviceLibrary::getId).collect(Collectors.toList()); List<Integer> deviceIds = deviceLibraries.stream().map(DeviceLibrary::getId).collect(Collectors.toList());
//将装备的父id全部置空 //将装备的父id全部置空
...@@ -991,6 +993,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService { ...@@ -991,6 +993,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
executor.execute(()->{ executor.execute(()->{
deviceLogService.addAllLog(deviceLogDtos); deviceLogService.addAllLog(deviceLogDtos);
}); });
}
//修改列装 //修改列装
packingLibrary.setPartParentId(null); packingLibrary.setPartParentId(null);
PackingLog packingLog = new PackingLog(); PackingLog packingLog = new PackingLog();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论