From b281af6a899a50d33744399a736e5e7191ac6611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 12 Jul 2024 17:09:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMarketStandardDetailServiceImpl.java | 94 ++++++++++--------- 1 file changed, 52 insertions(+), 42 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java index 98205d63..ee744874 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java @@ -69,6 +69,10 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl listStandardIds = getStandardIds(manifestId); - // 验证标准编号是否重复 - List listStandardIdRepeat = new ArrayList<>(); - for (int i = 0; i < listLawsMarketStandardDetail.size(); i++) { - LawsMarketStandardDetail p = listLawsMarketStandardDetail.get(i); - p.setManifestId(manifestId); - // 校验数据 - StringBuilder s = new StringBuilder(); - StringBuilder g = ValidUtil.validateReturnBuilder(p); - if(!StringUtils.isEmpty(g.toString())){ - s.append(g.toString()); - } - // 验证字典值是否满足条件 - StringBuilder dict = lawsCommonService.validateFieldByDict(p); - if(!StringUtils.isBlank(dict)){ - s.append(dict); - } - // 验证标准编号 - checkStandard(listIds, listStandardIds, listStandardIdRepeat, p, s); - if(!StringUtils.isBlank(s.toString())){ - m.append("第").append(i + 1).append("行，").append(s.toString()); - } - } + StringBuilder m = getStringBuilder(manifestId, listLawsMarketStandardDetail, listIds); if(!StringUtils.isBlank(m.toString())){ return Result.error(m.toString()); @@ -244,6 +224,36 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl listLawsMarketStandardDetail, List listIds) { + StringBuilder m = new StringBuilder(); + // 获取当前清单的标准 + List listStandardIds = getStandardIds(manifestId); + // 验证标准编号是否重复 + List listStandardIdRepeat = new ArrayList<>(); + for (int i = 0; i < listLawsMarketStandardDetail.size(); i++) { + LawsMarketStandardDetail p = listLawsMarketStandardDetail.get(i); + p.setManifestId(manifestId); + // 校验数据 + StringBuilder s = new StringBuilder(); + StringBuilder g = ValidUtil.validateReturnBuilder(p); + if(!StringUtils.isEmpty(g.toString())){ + s.append(g.toString()); + } + // 验证字典值是否满足条件 + StringBuilder dict = lawsCommonService.validateFieldByDict(p); + if(!StringUtils.isBlank(dict)){ + s.append(dict); + } + // 验证标准编号 + checkStandard(listIds, listStandardIds, listStandardIdRepeat, p, s); + if(!StringUtils.isBlank(s.toString())){ + m.append("第").append(i + 1).append("行，").append(s.toString()); + } + } + return m; + } + @Nullable private List getLawsMarketStandardDetailExcels(MultipartFile file, ImportParams params) throws Exception { List listLawsMarketStandardDetailExcel = ExcelImportUtil.importExcel( @@ -344,17 +354,17 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl listStandardId = list.stream().map(LawsMarketStandardDetail::getStandardId).collect(Collectors.toList()); LambdaQueryWrapper queryOld = new LambdaQueryWrapper<>(); @@ -377,13 +387,13 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl copy(String oldId,String newId) { LawsMarketStandard lawsMarketStandard = marketStandardService.getById(newId); if(Objects.isNull(lawsMarketStandard)){ - return Result.error("数据不存在"); + return Result.error(NOT_DATA); } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin) && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin) && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())){ - return Result.error("没有权限"); + return Result.error(NO_PERMISSIONS); } LambdaQueryWrapper queryOld = new LambdaQueryWrapper<>(); queryOld.in(LawsMarketStandardDetail::getManifestId,Arrays.asList(oldId.split(","))); @@ -423,13 +433,13 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl edit(LawsMarketStandardDetail marketStandardDetail) { LawsMarketStandard lawsMarketStandard = marketStandardService.getById(marketStandardDetail.getManifestId()); if(Objects.isNull(lawsMarketStandard)){ - return Result.error("数据不存在"); + return Result.error(NOT_DATA); } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin) && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin) && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId())){ - return Result.error("没有权限"); + return Result.error(NO_PERMISSIONS); } LambdaQueryWrapper queryLawsMarketStandardDetail = new LambdaQueryWrapper<>(); queryLawsMarketStandardDetail.eq(LawsMarketStandardDetail::getStandardId,marketStandardDetail.getStandardId()); @@ -494,7 +504,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl queryById(String id) { LawsMarketStandardDetail lawsMarketStandardDetail = getById(id); if(Objects.isNull(lawsMarketStandardDetail)){ - return Result.error("数据不存在"); + return Result.error(NOT_DATA); } LawsMarketStandard lawsMarketStandard = marketStandardService.getById(lawsMarketStandardDetail.getManifestId()); if(Objects.isNull(lawsMarketStandard)){ - return Result.error("数据不存在"); + return Result.error(NOT_DATA); } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if(!Arrays.asList(sysUser.getRoleIds().split(",")).contains(lawsAdmin) && !Arrays.asList(sysUser.getRoleIds().split(",")).contains(superAdmin) && !Objects.equals(lawsMarketStandard.getAuthor(),sysUser.getId()) && !Objects.equals(lawsMarketStandard.getManifestStatus(),MarketStandardConstants.MANIFEST_STATUS_PUBLISH)){ - return Result.error("没有权限"); + return Result.error(NO_PERMISSIONS); } return Result.OK(lawsMarketStandardDetail); } @@ -537,7 +547,7 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl