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

修改企业标准导入逻辑，如果是否有效状态是无效可以导入同名的企标编号或企标名称

Browse Source
This commit is contained in:
SUNJIABIN
2023-03-31 17:15:55 +08:00
parent f6731e85bd
commit 3e5b30f9ab
1 changed files with 10 additions and 4 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
+10 -4
View File
@@ -2772,11 +2772,17 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>(); QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
.eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName()); .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
Integer count = iSarBussionessStandService.count(queryWrapper); List<SarBussionessStand> list = iSarBussionessStandService.list(queryWrapper);
if (count > 0){ Integer valIdFlag = 0;
//return Result.error("当前企标标准号和企标名称已存在"); for (SarBussionessStand stand :list){
throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在"); if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
valIdFlag = stand.getValidFlag();
if (valIdFlag == 0){
throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
}
}
} }
//此处判断是否是带入的标准 //此处判断是否是带入的标准
if(StringUtils.isNotBlank(sarBussionessStand.getId())) { if(StringUtils.isNotBlank(sarBussionessStand.getId())) {
bussId = sarBussionessStand.getId(); bussId = sarBussionessStand.getId();