虚拟清单导入--验证标准号
This commit is contained in:
+51
-43
@@ -839,7 +839,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
String value = "";
|
||||
boolean flag = true;
|
||||
//编号验证
|
||||
List<BussDocumentLibraryEO> bussDocumentLibraryEOList = verifySerialNumber(dataList,dummyInventoryInfoEOTemp);
|
||||
verifySerialNumber(dataList,dummyInventoryInfoEOTemp);
|
||||
for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) {
|
||||
i++;
|
||||
String errorMsg = "";
|
||||
@@ -1018,52 +1018,60 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
}
|
||||
}
|
||||
|
||||
private List<BussDocumentLibraryEO> verifySerialNumber(List<DummyInventoryInfoEO> dataList,DummyInventoryInfoEO dummyInventoryInfoEOTemp) {
|
||||
private void verifySerialNumber(List<DummyInventoryInfoEO> dataList,DummyInventoryInfoEO dummyInventoryInfoEOTemp) {
|
||||
//文档库数据
|
||||
List<String> serialNumberList = dataList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList());
|
||||
LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberList);
|
||||
List<BussDocumentLibraryEO> bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper);
|
||||
//文档库中可能存在重复的标准号
|
||||
List<String> serialNumberListTemp = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList());
|
||||
|
||||
//虚拟清单数据
|
||||
LambdaQueryWrapper<DummyInventoryInfoEO> wrapperTemp = new LambdaQueryWrapper<>();
|
||||
wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberList).in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryInfoEOTemp.getDummyInventoryBaseId());
|
||||
List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(wrapperTemp);
|
||||
List<String> serialNumberTempList = dummyInventoryInfoEOList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList());
|
||||
if(serialNumberList.size() != serialNumberListTemp.size()){
|
||||
//存在文档库没有的数据
|
||||
List<String> collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
|
||||
List<String> serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList());
|
||||
if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){
|
||||
throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加");
|
||||
}else{
|
||||
throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the document library and cannot be added");
|
||||
List<String> serialNumberS = new ArrayList<>();
|
||||
if(serialNumberList.size() != 0){
|
||||
for (String s : serialNumberList) {
|
||||
if(StringUtils.isNotBlank(s)){
|
||||
serialNumberS.add(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
if(dummyInventoryInfoEOList.size() > 0){
|
||||
if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){
|
||||
throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加");
|
||||
}else{
|
||||
throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again");
|
||||
if(serialNumberS.size() != 0){
|
||||
LambdaQueryWrapper<BussDocumentLibraryEO> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberS);
|
||||
List<BussDocumentLibraryEO> bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper);
|
||||
//文档库中可能存在重复的标准号
|
||||
List<String> serialNumberListTemp = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList());
|
||||
|
||||
//虚拟清单数据
|
||||
LambdaQueryWrapper<DummyInventoryInfoEO> wrapperTemp = new LambdaQueryWrapper<>();
|
||||
wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberS).in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryInfoEOTemp.getDummyInventoryBaseId());
|
||||
List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(wrapperTemp);
|
||||
List<String> serialNumberTempList = dummyInventoryInfoEOList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList());
|
||||
if(serialNumberS.size() != serialNumberListTemp.size()){
|
||||
//存在文档库没有的数据
|
||||
List<String> collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList());
|
||||
List<String> serialNumbers = serialNumberS.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList());
|
||||
if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){
|
||||
throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加");
|
||||
}else{
|
||||
throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the document library and cannot be added");
|
||||
}
|
||||
}
|
||||
if(dummyInventoryInfoEOList.size() > 0){
|
||||
if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){
|
||||
throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加");
|
||||
}else{
|
||||
throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again");
|
||||
}
|
||||
}
|
||||
//通过编号将导入的数据与文档库进行关联
|
||||
for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) {
|
||||
List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOList.stream()
|
||||
.filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList());
|
||||
dummyInventoryInfoEO.setTitle(collect.get(0).getTitle());
|
||||
dummyInventoryInfoEO.setState(collect.get(0).getState());
|
||||
dummyInventoryInfoEO.setCorrespondingStandard(collect.get(0).getCorrespondingStandard());
|
||||
dummyInventoryInfoEO.setTechnologyTerritory(collect.get(0).getTechnologyTerritory());
|
||||
dummyInventoryInfoEO.setRegion(collect.get(0).getRegion());
|
||||
dummyInventoryInfoEO.setShi4Yong4Fan4Wei2(collect.get(0).getShi4Yong4Fan4Wei2());
|
||||
dummyInventoryInfoEO.setImplementTime(collect.get(0).getImplementTime());
|
||||
dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1());
|
||||
}
|
||||
}
|
||||
//通过编号将导入的数据与文档库进行关联
|
||||
for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) {
|
||||
List<BussDocumentLibraryEO> collect = bussDocumentLibraryEOList.stream()
|
||||
.filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList());
|
||||
dummyInventoryInfoEO.setTitle(collect.get(0).getTitle());
|
||||
dummyInventoryInfoEO.setState(collect.get(0).getState());
|
||||
dummyInventoryInfoEO.setCorrespondingStandard(collect.get(0).getCorrespondingStandard());
|
||||
dummyInventoryInfoEO.setTechnologyTerritory(collect.get(0).getTechnologyTerritory());
|
||||
dummyInventoryInfoEO.setRegion(collect.get(0).getRegion());
|
||||
dummyInventoryInfoEO.setShi4Yong4Fan4Wei2(collect.get(0).getShi4Yong4Fan4Wei2());
|
||||
dummyInventoryInfoEO.setImplementTime(collect.get(0).getImplementTime());
|
||||
dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1());
|
||||
}
|
||||
|
||||
return bussDocumentLibraryEOList;
|
||||
}
|
||||
|
||||
private String template(String zipEntryName, DummyInventoryInfoEO dummyInventoryInfoEO,
|
||||
@@ -1206,9 +1214,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
|
||||
if(StringUtils.isBlank(serialNumber)){
|
||||
errorCount ++;
|
||||
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
|
||||
errorMsg += "编号为必填项,不能为空";
|
||||
errorMsg += nameCn + "为必填项,不能为空";
|
||||
}else{
|
||||
errorMsg += "serial number this parameter is mandatory and cannot be empty";
|
||||
errorMsg += nameEn + " this parameter is mandatory and cannot be empty";
|
||||
}
|
||||
msgList.add(errorMsg);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user