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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!41
This commit is contained in:
高嵩
2023-04-06 12:33:04 +08:00
parent 52cb08f6a6 8f83b8d5d3
commit 6c25d8958a
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
+1
View File
@@ -160,6 +160,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
//企标标准导入模板下载 //企标标准导入模板下载
addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/exportTemplateFile"); addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/exportTemplateFile");
//doc文檔重新轉換 //doc文檔重新轉換
addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/convertDocAll_GNW"); addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/convertDocAll_GNW");
addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/convertDocAll_QB"); addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/convertDocAll_QB");
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+4 -4
View File
@@ -86,12 +86,12 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
@Override @Override
public String modPlan(EsRevisePlan esRevisePlan) { public String modPlan(EsRevisePlan esRevisePlan) {
List<EsRevisePlan> esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan); List<EsRevisePlan> esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan);
if (esRevisePlans.size()>0){ // if (esRevisePlans.size()>0){
return "企标名称不能重复,请更换新的企标名称。"; // return "企标名称不能重复,请更换新的企标名称。";
}else { // }else {
esRevisePlanDao.updateById(esRevisePlan); esRevisePlanDao.updateById(esRevisePlan);
return "操作成功"; return "操作成功";
} // }
} }
@Override @Override
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+2 -2
View File
@@ -169,7 +169,7 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
public ResponseMessage<SarBussionessStand> updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception { public ResponseMessage<SarBussionessStand> updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception {
//校验编号和名称是否存在 //校验编号和名称是否存在
QueryWrapper<SarBussionessStand> queryWrapper = new QueryWrapper<>(); QueryWrapper<SarBussionessStand> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(null!=sarBussionessStandEO.getStandNumber(),"STAND_NUMBER",sarBussionessStandEO.getStandNumber()) queryWrapper.eq(null!=sarBussionessStandEO.getStandCode(),"STAND_CODE",sarBussionessStandEO.getStandCode())
.eq(null!=sarBussionessStandEO.getStandName(),"STAND_NAME",sarBussionessStandEO.getStandName()); .eq(null!=sarBussionessStandEO.getStandName(),"STAND_NAME",sarBussionessStandEO.getStandName());
List<SarBussionessStand> list = sarBussionessStandEOService.list(queryWrapper); List<SarBussionessStand> list = sarBussionessStandEOService.list(queryWrapper);
Integer valIdFlag = 0; Integer valIdFlag = 0;
@@ -177,7 +177,7 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
valIdFlag = stand.getValidFlag(); valIdFlag = stand.getValidFlag();
if (valIdFlag == 0){ if (valIdFlag == 0){
throw new com.adc.da.exception.AdcDaBaseException("企标标准号"+ sarBussionessStandEO.getStandCode() +"或企标名称"+ sarBussionessStandEO.getStandName() +"已存在"); return Result.error("企标编号("+ sarBussionessStandEO.getStandCode() +")或企标名称("+ sarBussionessStandEO.getStandName() +")已存在");
} }
} }
} }