From 90cd1333e7466bf3cdb36c8aed846900395adbe1 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 11 Apr 2023 13:28:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoController.java | 71 ++++++++++++++---- .../dao/SarStandardsInfoDao.java | 6 ++ .../service/ISarStandardsInfoService.java | 3 + .../impl/SarStandardsInfoServiceImpl.java | 15 +++- .../SarStandardsInfoMapper.xml | 74 +++++++++++++++++++ 5 files changed, 153 insertions(+), 16 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 89dc5174..dd1783b6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -299,12 +299,24 @@ public class SarStandardsInfoController extends BaseController sarStandardsInfoEO.setMenuId("22179d54d4e640098e29"); } //校验编号和名称是否存在 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber()) - .eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName()); - Integer s1 = sarStandardsInfoEOService.count(queryWrapper); - if (s1>0){ - return Result.error("当前标准编号和中文名称已存在"); +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber()) +// .eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName()); + String standnumber = ""; + if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())){ + standnumber = sarStandardsInfoEO.getStandSort() + sarStandardsInfoEO.getStandNumber() + "-" + sarStandardsInfoEO.getStandYear(); + }else { + standnumber = sarStandardsInfoEO.getStandSort() + sarStandardsInfoEO.getStandNumber(); + } + List list = sarStandardsInfoEOService.listQuery(sarStandardsInfoEO); + String valIdFlag = "0"; + for (SarStandardsInfo stand :list){ + if ((list.size() ==1 && !list.get(0).getId().equals(sarStandardsInfoEO.getId())) || list.size() >1){ + valIdFlag = stand.getValidFlag(); + if (valIdFlag.equals("0")){ + return Result.error("企标编号("+ standnumber +")或企标名称("+ sarStandardsInfoEO.getStandName() +")已存在"); + } + } } sarStandardsInfoEOService.createSarStandardsInfo(sarStandardsInfoEO); return Result.success("0", "添加成功", sarStandardsInfoEO); @@ -316,12 +328,21 @@ public class SarStandardsInfoController extends BaseController // @RequiresPermissions("lawss:sarStandardsInfo:updateSarStandardsInfo") public ResponseMessage updateSarStandardsInfo(@RequestBody SarStandardsInfo sarStandardsInfoEO) throws Exception { //校验编号和名称是否存在 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber()) - .eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName()); - List list = sarStandardsInfoEOService.list(queryWrapper); - if ((list.size() ==1 && !list.get(0).getId().equals(sarStandardsInfoEO.getId())) || list.size() >1){ - return Result.error("当前标准编号和中文名称已存在"); + String standnumber = ""; + if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())){ + standnumber = sarStandardsInfoEO.getStandSort() + sarStandardsInfoEO.getStandNumber() + "-" + sarStandardsInfoEO.getStandYear(); + }else { + standnumber = sarStandardsInfoEO.getStandSort() + sarStandardsInfoEO.getStandNumber(); + } + List list = sarStandardsInfoEOService.listQuery(sarStandardsInfoEO); + String valIdFlag = "0"; + for (SarStandardsInfo stand :list){ + if ((list.size() ==1 && !list.get(0).getId().equals(sarStandardsInfoEO.getId())) || list.size() >1){ + valIdFlag = stand.getValidFlag(); + if (valIdFlag.equals("0")){ + return Result.error("企标编号("+ standnumber +")或企标名称("+ sarStandardsInfoEO.getStandName() +")已存在"); + } + } } int result = sarStandardsInfoEOService.updateSarStandardsInfo(sarStandardsInfoEO); if (result > 0) { @@ -540,7 +561,7 @@ public class SarStandardsInfoController extends BaseController @PostMapping("/validateStandNumber") //@RequiresPermissions("lawss:sarStandardsInfo:selectReplaceStandNum") public ResponseMessage validateStandNumber(SarStandardsInfoEOPage page) throws Exception { - if (StringUtils.isNotEmpty(page.getStandNumber()) && StringUtils.isNotEmpty(page.getStandSort())) { + if (StringUtils.isNotEmpty(page.getStandNumber()) && StringUtils.isNotEmpty(page.getStandSort()) && StringUtils.isNotBlank(page.getStandName())) { SarStandardsInfoEOPage newQueryPage = new SarStandardsInfoEOPage(); String standnumber = ""; if(StringUtils.isNotEmpty(page.getStandYear()) && !"null".equals(page.getStandYear())){ @@ -553,6 +574,7 @@ public class SarStandardsInfoController extends BaseController newQueryPage.setStandSort(page.getStandSort()); newQueryPage.setStandNumber(page.getStandNumber()); } + newQueryPage.setStandName(page.getStandName()); List standlist = sarStandardsInfoEOService.selectStandardsByStandnumber(newQueryPage, page.getStandType()); if (standlist.size() > 0) { if (StringUtils.isNotEmpty(page.getId())) { @@ -561,12 +583,30 @@ public class SarStandardsInfoController extends BaseController if (standlist.get(i).getId().equals(page.getId())) { continue; } else { - return Result.error(standnumber + "标准号已存在"); + List list = sarStandardsInfoEOService.listQuery2(page); + String valIdFlag = "0"; + for (SarStandardsInfo stand :list){ + if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ + valIdFlag = stand.getValidFlag(); + if (valIdFlag.equals("0")){ + return Result.error("企标编号("+ standnumber +")或企标名称("+ page.getStandName() +")已存在"); + } + } + } } } return Result.success(); } else { - return Result.error(standnumber + "标准号已存在"); + List list = sarStandardsInfoEOService.listQuery2(page); + String valIdFlag = "0"; + for (SarStandardsInfo stand :list){ + if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ + valIdFlag = stand.getValidFlag(); + if (valIdFlag.equals("0")){ + return Result.error("企标编号("+ standnumber +")或企标名称("+ page.getStandName() +")已存在"); + } + } + } } } else { return Result.success(); @@ -574,6 +614,7 @@ public class SarStandardsInfoController extends BaseController } else { return Result.success(); } + return Result.success(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index b23f5825..ec02df24 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -111,5 +111,11 @@ public interface SarStandardsInfoDao extends BaseMapper { OldSystem loreDepotSort(@Param("sortId") String sortId); List selectOldSystemInfoByBuidId(@Param("buildId") String buildId); + + List listQuery(SarStandardsInfo sarStandardsInfoEO); + + List listQuery2(SarStandardsInfoEOPage page); + + List selectStandardsByStandnumber2(SarStandardsInfo sarStandardsInfoEO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index a5162260..5f6129cd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -73,4 +73,7 @@ public interface ISarStandardsInfoService extends IService { void checkFileByEncrypt(); + List listQuery(SarStandardsInfo sarStandardsInfoEO); + + List listQuery2(SarStandardsInfoEOPage page); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 2a7faa7b..d1fd828e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -3026,7 +3026,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl listQuery(SarStandardsInfo sarStandardsInfoEO) { + return dao.listQuery(sarStandardsInfoEO); + } + + @Override + public List listQuery2(SarStandardsInfoEOPage page) { + return dao.listQuery2(page); + } + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 7b48e2c0..f5405ad9 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1965,5 +1965,79 @@ limit ${page.pager.startIndex-1},${page.pageSize} + + + + + +