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-03-27 18:13:43 +08:00
parent 484d2879e4 2434fc3f05
commit bfea9a313d
2 changed files with 4 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
+2
View File
@@ -3756,6 +3756,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
} }
objectList.add(UpdateStandNumberFileList); objectList.add(UpdateStandNumberFileList);
objectList.add(cannotModifyStandNumberFileList); objectList.add(cannotModifyStandNumberFileList);
logger.info("修改完成的数据是："+ UpdateStandNumberFileList);
logger.info("修改失败的数据是："+ cannotModifyStandNumberFileList);
return Result.success(objectList); return Result.success(objectList);
} }
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+2 -1
View File
@@ -898,11 +898,12 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
QueryWrapper<SarStandardsInfo> wrapper=new QueryWrapper<>(); QueryWrapper<SarStandardsInfo> wrapper=new QueryWrapper<>();
wrapper .eq("STAND_TYPE",page.getStandType()) wrapper .eq("STAND_TYPE",page.getStandType())
.eq(null!=page.getStandSort(),"STAND_SORT",page.getStandSort()) .eq(null!=page.getStandSort(),"STAND_SORT",page.getStandSort())
.eq(null!=page.getStandName(),"STAND_NAME",page.getStandName())
.eq(null!=page.getStandNumber(),"STAND_NUMBER",page.getStandNumber()) .eq(null!=page.getStandNumber(),"STAND_NUMBER",page.getStandNumber())
.eq(null!=page.getStandYear(),"STAND_YEAR",page.getStandYear()).eq("VALID_FLAG", 0); .eq(null!=page.getStandYear(),"STAND_YEAR",page.getStandYear()).eq("VALID_FLAG", 0);
Integer s=sarStandardsInfoEOService.count(wrapper); Integer s=sarStandardsInfoEOService.count(wrapper);
if (s>0){ if (s>0){
return Result.error("当前标准编号已存在"); return Result.error("当前标准编号或中文名称已存在");
}else { }else {
return Result.success(); return Result.success();
} }