From b352fe9490184e6c459356f6b937c6500c590f36 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 20 May 2022 18:47:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProjectLibraryBase.java | 2 -- .../project/entity/ProjectNameInfoEO.java | 5 +++ .../mapper/ProjectNameInfoEOMapper.java | 2 +- .../impl/ProjectLibraryBaseServiceImpl.java | 35 +++++++++---------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index 2550d2f76..46cdba5bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -62,11 +62,9 @@ public class ProjectLibraryBase implements Serializable { private java.lang.String certificationEngineerName; /**车型平台*/ - @TableField(exist = false) private java.lang.String vehiclePlatform; /**数字平台*/ - @TableField(exist = false) private java.lang.String digitalPlatform; /**IPD信息*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectNameInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectNameInfoEO.java index 64a35c61c..5d524f6e5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectNameInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectNameInfoEO.java @@ -62,6 +62,11 @@ public class ProjectNameInfoEO implements Serializable { @ApiModelProperty(value = "项目名称") private java.lang.String projectName; + /**年款id*/ + @ApiModelProperty(value = "年款id") + @TableField(exist = false) + private java.lang.String yearId; + /**年款名称*/ @ApiModelProperty(value = "年款名称") @TableField(exist = false) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java index 90a1c1774..a6678b114 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java @@ -13,7 +13,7 @@ import java.util.List; * @Version: V1.0 */ public interface ProjectNameInfoEOMapper extends BaseMapper { - @Select("select pni.id,pni.project_name,pnyi.id as year_id,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" + + @Select("select pni.id,pni.project_name,pyni.id as year_id,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" + "from project_name_info as pni\n" + "left join project_year_name_info as pyni on pni.id=pyni.project_name_id;") List selectProjectNameAndYear(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 0dd29813c..fc564f4eb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -10,7 +10,6 @@ import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ConditionAssessmentEO; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLibraryBase; -import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.enums.*; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; @@ -96,30 +95,28 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl projectNameAndYearList = projectNameInfoEOMapper.selectProjectNameAndYear(); - ProjectNameInfoEO projectNameAndYear = projectNameAndYearList.stream().filter(e -> e.getId().equals(projectNameId)).collect(Collectors.toList()).get(0); - //数字平台和车型平台同时和数据库里的一样,不新增,否则新增 - if(!(projectNameAndYear.getDigitalPlatform().equals(digitalPlatform) - && projectNameAndYear.getVehiclePlatform().equals(vehiclePlatform))){ - ProjectNameInfoEO projectNameInfoEO = new ProjectNameInfoEO(); - String nameInfoId = UUID.randomUUID().toString().replace("-", ""); - projectNameInfoEO.setId(nameInfoId); - projectNameInfoEO.setProjectName(projectLibraryBase.getProjectName()); - projectNameInfoEO.setVehiclePlatform(projectLibraryBase.getVehiclePlatform()); - projectNameInfoEO.setDigitalPlatform(projectLibraryBase.getDigitalPlatform()); - projectNameInfoEOService.add(projectNameInfoEO); + String yearNameId = projectLibraryBase.getYearNameId(); + String targetMarket = projectLibraryBase.getTargetMarket(); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("project_name_id",projectNameId).eq("year_name_id",yearNameId).eq("target_market",targetMarket); + Integer count = projectLibraryBaseMapper.selectCount(queryWrapper); + if (count > 0) { + if(CutEnum.CN.getValue().equals(projectLibraryBase.getCut())) { + throw new JeroBootException("已存在车型名称,年款号,目标市场均同的数据"); + }else{ + throw new JeroBootException("There are data with the same model name, model number and target market."); + } } } /** @@ -135,7 +132,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl