FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

Browse Source
This commit is contained in:
gaojiabao
2023-04-05 15:08:27 +08:00
parent a34f14d52f 1273b380f2
commit 7c747782ca
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+18 -1
View File
@@ -2775,6 +2775,22 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
}
}
}
//校验Excel中企标编号和企标名称同时存在重复
Map<String,SarBussStandAttrInfoExecl> map = new HashMap<>();
int count = 2;
for (String str : jsonList) {
count++;
SarBussStandAttrInfoExecl se = com.alibaba.fastjson.JSONObject.parseObject(str,SarBussStandAttrInfoExecl.class);
if(ObjectUtils.isNotEmpty(se)){
String key = se.getStandCode()+se.getStandName();
if(map.containsKey(key)){
logger.info("导入失败,第" + count +" 行需要导入的企标标号或企标名称重复");
return Result.error("导入失败,第" + count + " 行需要导入的企标标号或企标名称重复");
}else{
map.put(key,se);
}
}
}
//入库
try {
for (String infoJson : jsonList) {
@@ -2782,7 +2798,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
countSuccess++;
}
}catch (Exception e){
return Result.error("导入失败，请查看导入的数据是否有问题");
return Result.error("导入失败，请查看导入的数据是否有问题或导入的企标标号或企标名称重复");
}
String msg = "成功导入" + countSuccess + "条";
@@ -2818,6 +2834,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
valIdFlag = stand.getValidFlag();
if (valIdFlag == 0){
logger.info("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
}
}