From ab9a028f3e72af73d08189e0c6374b9be5bd4e20 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 9 Oct 2023 10:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BB=B6-=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=8E=89=E5=B9=B3=E5=8F=B0=E4=BB=B6=E6=96=B0=E6=B7=BB=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...PlatformProjectLibraryBaseServiceImpl.java | 18 +- .../project/entity/ProjectLibraryBase.java | 179 ++++++++---------- 2 files changed, 92 insertions(+), 105 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java index 69d3ad695..47ab2c106 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java @@ -1069,7 +1069,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); +// List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); for(ProjectLibraryBase projectLibraryBase: result){ //处理品牌 List sysDictItemList = dictItemList.stream() @@ -1098,14 +1098,14 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl param = new HashMap<>(); - param.put("cut",cut); - String targetMarket = getMarket(param, targetMarketList, projectLibraryBase); - //项目名称（功率-生产商-目标市场） - String projectName = projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarket; - projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值 - //平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值 - projectLibraryBase.setProjectName(projectName); +// Map param = new HashMap<>(); +// param.put("cut",cut); +// String targetMarket = getMarket(param, targetMarketList, projectLibraryBase); +// //项目名称（功率-生产商-目标市场） +// String projectName = projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarket; +// projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值 +// //平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值 +// projectLibraryBase.setProjectName(projectName); } if(ObjectUtils.isEmpty(params.get("orderByField"))){ 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 614332f72..6c08fb090 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 @@ -166,102 +166,89 @@ public class ProjectLibraryBase implements Comparable { //平台件项目库字段-------------------------------------------------------------------------------------------------------------- - @ApiModelProperty(value = "功率") - private String power; - - @ApiModelProperty(value = "生产商") - private String producer; - - @ApiModelProperty(value = "责任部门") - private String dutyDepart; - - @ApiModelProperty(value = "法规工程师") - private String regulationOwnerId; - - @ApiModelProperty(value = "工程接口人") - private String engineeringInterfacePerson; - - @ApiModelProperty(value = "名牌标签") - private String brandLabel; - - @ApiModelProperty(value = "产品型号") - private String productModel; - - @ApiModelProperty(value = "电芯生产企业") - private String cellEnterprise; - - @ApiModelProperty(value = "总成生产企业") - private String assemblyEnterprise; - - @ApiModelProperty(value = "零件号（国内）") - private String partNumberCn; - - @ApiModelProperty(value = "零件号（国外）") - private String part_numberEn; - - @ApiModelProperty(value = "24位备案码") - private String filingCode; - - @ApiModelProperty(value = "供应商代码（1-3）") - private String supplierCode; - - @ApiModelProperty(value = "产品类型代码（4）") - private String productTypeCode; - - @ApiModelProperty(value = "电池类型代码（5）") - private String batteryTypeCode; - - @ApiModelProperty(value = "规格代码（6-7）") - private String specificationCode; - - @ApiModelProperty(value = "追溯代码（8）") - private String traceabilityCode; - - @ApiModelProperty(value = "生产也月日序列号") - private String ymdNumber; - - @ApiModelProperty(value = "尺寸") - private String size; - - @ApiModelProperty(value = "额定容量") - private String ratedCapacity; - - @ApiModelProperty(value = "标称电压") - private String nominalVoltage; - - @ApiModelProperty(value = "额定质量") - private String ratedMass; - - @ApiModelProperty(value = "包含模块个数") - private String moduleNumber; - - @ApiModelProperty(value = "模块串并联方式") - private String connectionType; - - @ApiModelProperty(value = "所用模块或单体规格代码") - private String moduleSpecificationCode; - - @ApiModelProperty(value = "冷却方式") - private String coolingMethod; - - @ApiModelProperty(value = "备案完成时间") - private String filingCompletionTime; - - @ApiModelProperty(value = "备注") - private String remark; - - - - - - - - - - - - - +// @ApiModelProperty(value = "功率") +// private String power; +// +// @ApiModelProperty(value = "生产商") +// private String producer; +// +// @ApiModelProperty(value = "责任部门") +// private String dutyDepart; +// +// @ApiModelProperty(value = "法规工程师") +// private String regulationOwnerId; +// +// @ApiModelProperty(value = "工程接口人") +// private String engineeringInterfacePerson; +// +// @ApiModelProperty(value = "名牌标签") +// private String brandLabel; +// +// @ApiModelProperty(value = "产品型号") +// private String productModel; +// +// @ApiModelProperty(value = "电芯生产企业") +// private String cellEnterprise; +// +// @ApiModelProperty(value = "总成生产企业") +// private String assemblyEnterprise; +// +// @ApiModelProperty(value = "零件号（国内）") +// private String partNumberCn; +// +// @ApiModelProperty(value = "零件号（国外）") +// private String part_numberEn; +// +// @ApiModelProperty(value = "24位备案码") +// private String filingCode; +// +// @ApiModelProperty(value = "供应商代码（1-3）") +// private String supplierCode; +// +// @ApiModelProperty(value = "产品类型代码（4）") +// private String productTypeCode; +// +// @ApiModelProperty(value = "电池类型代码（5）") +// private String batteryTypeCode; +// +// @ApiModelProperty(value = "规格代码（6-7）") +// private String specificationCode; +// +// @ApiModelProperty(value = "追溯代码（8）") +// private String traceabilityCode; +// +// @ApiModelProperty(value = "生产也月日序列号") +// private String ymdNumber; +// +// @ApiModelProperty(value = "尺寸") +// private String size; +// +// @ApiModelProperty(value = "额定容量") +// private String ratedCapacity; +// +// @ApiModelProperty(value = "标称电压") +// private String nominalVoltage; +// +// @ApiModelProperty(value = "额定质量") +// private String ratedMass; +// +// @ApiModelProperty(value = "包含模块个数") +// private String moduleNumber; +// +// @ApiModelProperty(value = "模块串并联方式") +// private String connectionType; +// +// @ApiModelProperty(value = "所用模块或单体规格代码") +// private String moduleSpecificationCode; +// +// @ApiModelProperty(value = "冷却方式") +// private String coolingMethod; +// +// @ApiModelProperty(value = "备案完成时间") +// private String filingCompletionTime; +// +// @ApiModelProperty(value = "备注") +// private String remark; @Override