bug52732发布为空修改
This commit is contained in:
+27
-5
@@ -270,6 +270,11 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
|
|||||||
if(list.size() != 0){
|
if(list.size() != 0){
|
||||||
iDummyContentChangeEOService.saveBatch(list);
|
iDummyContentChangeEOService.saveBatch(list);
|
||||||
}
|
}
|
||||||
|
if(CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
|
||||||
|
throw new JeroBootException("维护清单为空,发布失败");
|
||||||
|
}else{
|
||||||
|
throw new JeroBootException("The maintenance list is empty, and publishing failed.");
|
||||||
|
}
|
||||||
}else{
|
}else{
|
||||||
//1.查询之前保存过的基础数据
|
//1.查询之前保存过的基础数据
|
||||||
LambdaQueryWrapper<DummyContentChangeEO> wrapperBase =new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<DummyContentChangeEO> wrapperBase =new LambdaQueryWrapper<>();
|
||||||
@@ -407,11 +412,28 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
|
|||||||
dummyContentChangeEOMapper.update(null,infoUpdateWrapper);
|
dummyContentChangeEOMapper.update(null,infoUpdateWrapper);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}else{
|
}else{//基础数据发布过,详情原为空-->有新增,再次发布
|
||||||
if(CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
|
List<DummyContentChangeEO> list = new ArrayList<>();
|
||||||
throw new JeroBootException("维护清单为空,发布失败");
|
if(dummyInventoryInfoEOList.size() != 0){
|
||||||
}else{
|
disposeData(dummyInventoryInfoEOList);
|
||||||
throw new JeroBootException("The maintenance list is empty, and publishing failed.");
|
String info = JSONArray.toJSONString(dummyInventoryInfoEOList);
|
||||||
|
DummyContentChangeEO dummyContentChangeEOInfo = new DummyContentChangeEO();
|
||||||
|
dummyContentChangeEOInfo.setParentId(dummyInventoryBaseEO.getId());
|
||||||
|
dummyContentChangeEOInfo.setContentJson(info);
|
||||||
|
list.add(dummyContentChangeEOInfo);
|
||||||
|
}
|
||||||
|
if(list.size() != 0){
|
||||||
|
String addSerialNumber = dummyInventoryInfoEOList.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(","));
|
||||||
|
iDummyContentChangeEOService.saveBatch(list);
|
||||||
|
sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(), null, addSerialNumber,null,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
|
||||||
|
// private void sendMsg(Map<String, String> baseDiff, String idTemp,List<Map<String, String>> infoDiffList,
|
||||||
|
// String addSerialNumber,String deleteSerialNumber,String state,String cut) {
|
||||||
|
}else {
|
||||||
|
if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
|
||||||
|
throw new JeroBootException("维护清单为空,发布失败");
|
||||||
|
} else {
|
||||||
|
throw new JeroBootException("The maintenance list is empty, and publishing failed.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user