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-12 14:38:28 +08:00
parent 2690eb6890 51e40593f8
commit 89c6fd4242
2 changed files with 54 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+44 -7
View File
@@ -207,11 +207,11 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
if (StringUtils.isNotEmpty(page.getStandCode()) && StringUtils.isNotEmpty(page.getStandSort())) { if (StringUtils.isNotEmpty(page.getStandCode()) && StringUtils.isNotEmpty(page.getStandSort())) {
String standnumber = ""; String standnumber = "";
if(StringUtils.isNotEmpty(page.getStandYear()) && !"null".equals(page.getStandYear())){ if(StringUtils.isNotEmpty(page.getStandYear()) && !"null".equals(page.getStandYear())){
standnumber = page.getStandSort() + " " + page.getStandCode() + "-" + page.getStandYear(); standnumber = page.getStandSort() + page.getStandNumber() + "-" + page.getStandYear();
standNumShow = sortName + " " + page.getStandCode() + "-" + page.getStandYear(); standNumShow = sortName + page.getStandNumber() + "-" + page.getStandYear();
} else { } else {
standnumber = page.getStandSort() + " " + page.getStandCode(); standnumber = page.getStandSort() + page.getStandNumber();
standNumShow = sortName + " " + page.getStandCode(); standNumShow = sortName + page.getStandNumber();
} }
List<SarBussionessStand> standlist = sarBussionessStandEOService.selectStandardsByStandNumber(standnumber); List<SarBussionessStand> standlist = sarBussionessStandEOService.selectStandardsByStandNumber(standnumber);
if (standlist.size() > 0) { if (standlist.size() > 0) {
@@ -221,19 +221,56 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
if (standlist.get(i).getId().equals(page.getId())) { if (standlist.get(i).getId().equals(page.getId())) {
continue; continue;
} else { } else {
return Result.error(standNumShow + "标准号已存在"); QueryWrapper<SarBussionessStand> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(null!=standnumber,"STAND_CODE",standnumber)
.eq(null!=page.getStandName(),"STAND_NAME",page.getStandName());
List<SarBussionessStand> 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(); return Result.success();
} else { } else {
return Result.error(standNumShow + "标准号已存在"); QueryWrapper<SarBussionessStand> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(null!=standnumber,"STAND_CODE",standnumber)
.eq(null!=page.getStandName(),"STAND_NAME",page.getStandName());
List<SarBussionessStand> 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 { } else {
return Result.success(); QueryWrapper<SarBussionessStand> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(null!=standnumber,"STAND_CODE",standnumber)
.eq(null!=page.getStandName(),"STAND_NAME",page.getStandName());
List<SarBussionessStand> 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 { } else {
return Result.success(); return Result.success();
} }
return Result.success();
} }
/** /**
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java
+10
View File
@@ -14,6 +14,16 @@ import java.util.List;
*/ */
public class SarBussionessStandEOPage extends BasePage { 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 textStatusBuss;
private String reviseStatus; private String reviseStatus;