项目库基础表修改

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信息*/

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)

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<ProjectNameInfoEO> {
-    @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<ProjectNameInfoEO> selectProjectNameAndYear();

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<ProjectLibraryBas
 		projectLibraryBase.setCreateBy(sysUser.getUsername());
 		projectLibraryBase.setUpdateBy(sysUser.getUsername());
 
-		checkExitNameInfo(projectLibraryBase);
+		checkExitData(projectLibraryBase);
 		save(projectLibraryBase);
 
 		//创建任务计划时间轴
 		projectTaskPlanningService.setProjectTaskPlanning(projectLibraryBase.getId());
 	}
 
-	/**检查数字平台和车型平台*/
+
-	public void checkExitNameInfo(ProjectLibraryBase projectLibraryBase){
+	/**检查车型名称id,年款号,目标市场同时存在,报错*/
+	public void checkExitData(ProjectLibraryBase projectLibraryBase){
 		String projectNameId = projectLibraryBase.getProjectNameId();
-		String digitalPlatform = projectLibraryBase.getDigitalPlatform();
+		String yearNameId = projectLibraryBase.getYearNameId();
-		String vehiclePlatform = projectLibraryBase.getVehiclePlatform();
+		String targetMarket = projectLibraryBase.getTargetMarket();
-		List<ProjectNameInfoEO> projectNameAndYearList = projectNameInfoEOMapper.selectProjectNameAndYear();
+		QueryWrapper<ProjectLibraryBase> queryWrapper = new QueryWrapper<>();
-		ProjectNameInfoEO projectNameAndYear = projectNameAndYearList.stream().filter(e -> e.getId().equals(projectNameId)).collect(Collectors.toList()).get(0);
+		queryWrapper.eq("project_name_id",projectNameId).eq("year_name_id",yearNameId).eq("target_market",targetMarket);
-		//数字平台和车型平台同时和数据库里的一样,不新增,否则新增
+		Integer count = projectLibraryBaseMapper.selectCount(queryWrapper);
-		if(!(projectNameAndYear.getDigitalPlatform().equals(digitalPlatform)
+		if (count > 0) {
-				&& projectNameAndYear.getVehiclePlatform().equals(vehiclePlatform))){
+			if(CutEnum.CN.getValue().equals(projectLibraryBase.getCut())) {
-			ProjectNameInfoEO projectNameInfoEO = new ProjectNameInfoEO();
+				throw new JeroBootException("已存在车型名称,年款号,目标市场均同的数据");
-			String nameInfoId = UUID.randomUUID().toString().replace("-", "");
+			}else{
-			projectNameInfoEO.setId(nameInfoId);
+				throw new JeroBootException("There are data with the same model name, model number and target market.");
-			projectNameInfoEO.setProjectName(projectLibraryBase.getProjectName());
+			}
-			projectNameInfoEO.setVehiclePlatform(projectLibraryBase.getVehiclePlatform());
-			projectNameInfoEO.setDigitalPlatform(projectLibraryBase.getDigitalPlatform());
-			projectNameInfoEOService.add(projectNameInfoEO);
 		}
 	}
 	/**
@@ -135,7 +132,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		projectLibraryBase.setUpdateBy(sysUser.getUsername());
 
-		checkExitNameInfo(projectLibraryBase);
+		checkExitData(projectLibraryBase);
 		saveOrUpdate(projectLibraryBase);
 	}