diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index cd8ce7c4..3198eeea 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -207,11 +207,11 @@ public class SarBussionessStandController extends BaseController standlist = sarBussionessStandEOService.selectStandardsByStandNumber(standnumber); if (standlist.size() > 0) { @@ -221,7 +221,19 @@ public class SarBussionessStandController extends BaseController queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(null!=standnumber,"STAND_CODE",standnumber) + .eq(null!=page.getStandName(),"STAND_NAME",page.getStandName()); + List list = sarBussionessStandEOService.list(queryWrapper); + Integer valIdFlag = 0; + for (SarBussionessStand stand :list){ + if ((list.size() >=1 && !stand.getId().equals(page.getId()))){ + valIdFlag = stand.getValidFlag(); + if (valIdFlag == 0){ + return Result.error("企标编号("+ standnumber +")或企标名称("+ page.getStandName() +")已存在"); + } + } + } } } return Result.success(); @@ -229,11 +241,24 @@ public class SarBussionessStandController extends BaseController queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(null!=standnumber,"STAND_CODE",standnumber) + .eq(null!=page.getStandName(),"STAND_NAME",page.getStandName()); + List list = sarBussionessStandEOService.list(queryWrapper); + Integer valIdFlag = 0; + for (SarBussionessStand stand :list){ + if ((list.size() >=1 && !stand.getId().equals(page.getId()))){ + valIdFlag = stand.getValidFlag(); + if (valIdFlag == 0){ + return Result.error("企标编号("+ standnumber +")或企标名称("+ page.getStandName() +")已存在"); + } + } + } } } else { return Result.success(); } + return Result.success(); } /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java index d2cc26c9..b9a18752 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java @@ -14,6 +14,16 @@ import java.util.List; */ public class SarBussionessStandEOPage extends BasePage { + private String standNumber; + + public String getStandNumber() { + return standNumber; + } + + public void setStandNumber(String standNumber) { + this.standNumber = standNumber; + } + private String textStatusBuss; private String reviseStatus;