From 91bea54fe9f756442341e91d92cb226569f5a066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 25 Sep 2024 15:55:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=94=AE=E9=9B=B6=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=85=B3=E7=B3=BB=E7=AE=A1=E7=90=86=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterprise/entity/dto/ESPlanQueryDTO.java | 2 +- .../LawsPartRelevanceController.java | 3 +- .../laws/part/entity/LawsPartRelevance.java | 2 +- .../service/ILawsPartRelevanceService.java | 3 +- .../impl/LawsPartRelevanceServiceImpl.java | 56 +++++++++++-------- 5 files changed, 37 insertions(+), 29 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESPlanQueryDTO.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESPlanQueryDTO.java index b189a9fc..7c8c7b3d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESPlanQueryDTO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/dto/ESPlanQueryDTO.java @@ -50,7 +50,7 @@ public class ESPlanQueryDTO { @ApiModelProperty(value = "主起草单位") private String mainDraftingUnit; - @ApiModelProperty(value = "主起草单位责任人") + @ApiModelProperty(value = "主起草单位业务支持-关键零部件绑定关系管理") private String mainDraftingUnitResponsiblePerson; @ApiModelProperty(value = "项目状态") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartRelevanceController.java b/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartRelevanceController.java index cd3cd1d6..80ac5e58 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartRelevanceController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/controller/LawsPartRelevanceController.java @@ -157,8 +157,7 @@ public class LawsPartRelevanceController { @PostMapping(value = "/importExcel") // @RequiresPermissions("marketStandard:detail:operate") public Result importExcel(@RequestParam("file") @ApiParam("文件") MultipartFile file) { - lawsPartRelevanceService.importExcel(file); - return Result.OK(ResultCommon.OK); + return lawsPartRelevanceService.importExcel(file); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartRelevance.java b/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartRelevance.java index fb4eb8ff..614f0cdd 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartRelevance.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/entity/LawsPartRelevance.java @@ -60,7 +60,7 @@ public class LawsPartRelevance implements Serializable { * 关键零部件名称 */ @ApiModelProperty(value = "关键零部件名称") - @Excel(name = "关键零部件名称", width = 15) + @Excel(name = "关键零部件名称", width = 15, dictTable = "laws_part_pmm_partition_info", dicCode = "fnd_gpc", dicText = "reg_part_name_cn") @TableField(exist = false) @Dict(dictTable = "laws_part_pmm_partition_info", dicCode = "fnd_gpc", dicText = "reg_part_name_cn") private String regPartNameCn; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartRelevanceService.java b/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartRelevanceService.java index 33ee1c8a..f8228060 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartRelevanceService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/service/ILawsPartRelevanceService.java @@ -2,6 +2,7 @@ package com.jero.modules.laws.part.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.common.api.vo.Result; import com.jero.modules.laws.part.entity.LawsPartRelevance; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; @@ -25,7 +26,7 @@ public interface ILawsPartRelevanceService extends IService { void edit(LawsPartRelevance lawsPartRelevance); - void importExcel(MultipartFile file); + Result importExcel(MultipartFile file); ModelAndView downloadTemplate(HttpServletResponse response); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java index eee8c3fa..b819c90b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/part/service/impl/LawsPartRelevanceServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; @@ -165,10 +166,10 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl importExcel(MultipartFile file) { // 校验文件是否为excel if (!ImportExcelUtil.checkExcelFile(file)) { - throw new JeroBootException(ResultCommon.IMPORT_THE_EXCEL_FILE); + return Result.error(ResultCommon.IMPORT_THE_EXCEL_FILE); } ImportParams params = new ImportParams(); params.setHeadRows(1); @@ -176,13 +177,13 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl listLawsPartRelevance = ExcelImportUtil.importExcel( file.getInputStream(), LawsPartRelevance.class, params); if(CollectionUtils.isEmpty(listLawsPartRelevance)){ - throw new JeroBootException(ResultCommon.IMPORT_DATA_CANNOT_BE_EMPTY); + return Result.error(ResultCommon.IMPORT_DATA_CANNOT_BE_EMPTY); } StringBuilder m = new StringBuilder(); for (LawsPartRelevance lawsPartRelevance : listLawsPartRelevance) { @@ -197,8 +198,18 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl listOld = list(queryLawsPartRelevance); + List listNotNull = listLawsPartRelevance.stream().filter(o->!StringUtils.isBlank(o.getFndGpc())).collect(Collectors.toList()); + List lawsPartPmmPartitionInfoList = new ArrayList<>(); + if(!CollectionUtils.isEmpty(listNotNull)){ + List listFndGpc = listLawsPartRelevance.stream().map(LawsPartRelevance::getFndGpc).collect(Collectors.toList()); + String fndGpc = String.join(",", listFndGpc); + listFndGpc = Arrays.asList(fndGpc.split(",")); + LambdaQueryWrapper queryLawsPartPmmPartitionInfo = new LambdaQueryWrapper<>(); + queryLawsPartPmmPartitionInfo.in(LawsPartPmmPartitionInfo::getFndGpc,listFndGpc); + lawsPartPmmPartitionInfoList = lawsPartPmmPartitionInfoService + .list(queryLawsPartPmmPartitionInfo); + } - List lawsPartPmmPartitionInfoList = lawsPartPmmPartitionInfoService.list(); Set setAlready = new HashSet<>(); // 校验数据 for (int i = 0; i < listLawsPartRelevance.size(); i++) { @@ -213,16 +224,14 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl lawsPartPmmPartitionInfoListSub = lawsPartPmmPartitionInfoList - .stream().filter(o->Objects.equals(o.getRegPartNameCn(), - lawsPartRelevance.getRegPartNameCn())).collect(Collectors.toList()); - if(!CollectionUtils.isEmpty(lawsPartPmmPartitionInfoListSub)){ - lawsPartRelevance.setFndGpc(lawsPartPmmPartitionInfoListSub.get(0).getFndGpc()); - }else{ + List listFndGpc = Arrays.asList(lawsPartRelevance.getFndGpc().split(",")); + long l = lawsPartPmmPartitionInfoList + .stream().filter(o->listFndGpc.contains(o.getFndGpc())).count(); + if(l != listFndGpc.size()){ s.append(Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ? - "关键零部件名称 does not exist" : "关键零部件名称不存在"); + "关键零部件名称 does not exist," : "关键零部件名称不存在,"); } } } @@ -230,29 +239,28 @@ public class LawsPartRelevanceServiceImpl extends ServiceImplObjects.equals(o.getFndGpc() + "_" + o.getSystemCode(), - code)).count(); + long l = listOld.stream().filter(o->Objects.equals(o.getFndGpc(), code)).count(); if(l > 0){ - throw new JeroBootException((Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ? - "名称与功能系统码 already exists" : "名称与功能系统码已存在")); + s.append((Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ? + "名称与功能系统码 already exists," : "名称与功能系统码已存在,")); } } // 校验重复 if(!CollectionUtils.isEmpty(setAlready) && !StringUtils.isBlank(code)){ long l = setAlready.stream().filter(o->Objects.equals(o,code)).count(); if(l > 0){ - throw new JeroBootException((Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ? - "名称与功能系统码 duplicate" : "名称与功能系统码重复")); + s.append((Objects.equals(LocaleContextHolder.getLocale(),Locale.ENGLISH) ? + "名称与功能系统码 duplicate," : "名称与功能系统码重复,")); } } setAlready.add(code); @@ -263,13 +271,13 @@ public class LawsPartRelevanceServiceImpl extends ServiceImpl