WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT

Browse Source
This commit is contained in:
高嵩
2023-10-09 10:51:04 +08:00
parent 7b8483fa93 ab9a028f3e
commit 9ff14f2380
2 changed files with 92 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLibraryBaseServiceImpl.java
+9 -9
View File
@@ -1069,7 +1069,7 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
topProjectEOList = iTopProjectEOService.list(wrapper); topProjectEOList = iTopProjectEOService.list(wrapper);
} }
//目标市场数据字典 //目标市场数据字典
List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); // List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
for(ProjectLibraryBase projectLibraryBase: result){ for(ProjectLibraryBase projectLibraryBase: result){
//处理品牌 //处理品牌
List<SysDictItem> sysDictItemList = dictItemList.stream() List<SysDictItem> sysDictItemList = dictItemList.stream()
@@ -1098,14 +1098,14 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
} }
//目标市场 //目标市场
Map<String,Object> param = new HashMap<>(); // Map<String,Object> param = new HashMap<>();
param.put("cut",cut); // param.put("cut",cut);
String targetMarket = getMarket(param, targetMarketList, projectLibraryBase); // String targetMarket = getMarket(param, targetMarketList, projectLibraryBase);
//项目名称（功率-生产商-目标市场） // //项目名称（功率-生产商-目标市场）
String projectName = projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarket; // String projectName = projectLibraryBase.getPower() + "-" + projectLibraryBase.getProducer() + "-" + targetMarket;
projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值 // projectLibraryBase.setProjectNameId(projectName);//原设计平台件项目名称去这个字段值
//平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值 // //平台件项目名称改为拼接的形式，projectNameId不在存数据，如果这个变更影响其他的地方，项目名称取值可以取projectName的值
projectLibraryBase.setProjectName(projectName); // projectLibraryBase.setProjectName(projectName);
} }
if(ObjectUtils.isEmpty(params.get("orderByField"))){ if(ObjectUtils.isEmpty(params.get("orderByField"))){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+83 -96
View File
@@ -166,102 +166,89 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
//平台件项目库字段-------------------------------------------------------------------------------------------------------------- //平台件项目库字段--------------------------------------------------------------------------------------------------------------
@ApiModelProperty(value = "功率") // @ApiModelProperty(value = "功率")
private String power; // private String power;
//
@ApiModelProperty(value = "生产商") // @ApiModelProperty(value = "生产商")
private String producer; // private String producer;
//
@ApiModelProperty(value = "责任部门") // @ApiModelProperty(value = "责任部门")
private String dutyDepart; // private String dutyDepart;
//
@ApiModelProperty(value = "法规工程师") // @ApiModelProperty(value = "法规工程师")
private String regulationOwnerId; // private String regulationOwnerId;
//
@ApiModelProperty(value = "工程接口人") // @ApiModelProperty(value = "工程接口人")
private String engineeringInterfacePerson; // private String engineeringInterfacePerson;
//
@ApiModelProperty(value = "名牌标签") // @ApiModelProperty(value = "名牌标签")
private String brandLabel; // private String brandLabel;
//
@ApiModelProperty(value = "产品型号") // @ApiModelProperty(value = "产品型号")
private String productModel; // private String productModel;
//
@ApiModelProperty(value = "电芯生产企业") // @ApiModelProperty(value = "电芯生产企业")
private String cellEnterprise; // private String cellEnterprise;
//
@ApiModelProperty(value = "总成生产企业") // @ApiModelProperty(value = "总成生产企业")
private String assemblyEnterprise; // private String assemblyEnterprise;
//
@ApiModelProperty(value = "零件号（国内）") // @ApiModelProperty(value = "零件号（国内）")
private String partNumberCn; // private String partNumberCn;
//
@ApiModelProperty(value = "零件号（国外）") // @ApiModelProperty(value = "零件号（国外）")
private String part_numberEn; // private String part_numberEn;
//
@ApiModelProperty(value = "24位备案码") // @ApiModelProperty(value = "24位备案码")
private String filingCode; // private String filingCode;
//
@ApiModelProperty(value = "供应商代码（1-3）") // @ApiModelProperty(value = "供应商代码（1-3）")
private String supplierCode; // private String supplierCode;
//
@ApiModelProperty(value = "产品类型代码（4）") // @ApiModelProperty(value = "产品类型代码（4）")
private String productTypeCode; // private String productTypeCode;
//
@ApiModelProperty(value = "电池类型代码（5）") // @ApiModelProperty(value = "电池类型代码（5）")
private String batteryTypeCode; // private String batteryTypeCode;
//
@ApiModelProperty(value = "规格代码（6-7）") // @ApiModelProperty(value = "规格代码（6-7）")
private String specificationCode; // private String specificationCode;
//
@ApiModelProperty(value = "追溯代码（8）") // @ApiModelProperty(value = "追溯代码（8）")
private String traceabilityCode; // private String traceabilityCode;
//
@ApiModelProperty(value = "生产也月日序列号") // @ApiModelProperty(value = "生产也月日序列号")
private String ymdNumber; // private String ymdNumber;
//
@ApiModelProperty(value = "尺寸") // @ApiModelProperty(value = "尺寸")
private String size; // private String size;
//
@ApiModelProperty(value = "额定容量") // @ApiModelProperty(value = "额定容量")
private String ratedCapacity; // private String ratedCapacity;
//
@ApiModelProperty(value = "标称电压") // @ApiModelProperty(value = "标称电压")
private String nominalVoltage; // private String nominalVoltage;
//
@ApiModelProperty(value = "额定质量") // @ApiModelProperty(value = "额定质量")
private String ratedMass; // private String ratedMass;
//
@ApiModelProperty(value = "包含模块个数") // @ApiModelProperty(value = "包含模块个数")
private String moduleNumber; // private String moduleNumber;
//
@ApiModelProperty(value = "模块串并联方式") // @ApiModelProperty(value = "模块串并联方式")
private String connectionType; // private String connectionType;
//
@ApiModelProperty(value = "所用模块或单体规格代码") // @ApiModelProperty(value = "所用模块或单体规格代码")
private String moduleSpecificationCode; // private String moduleSpecificationCode;
//
@ApiModelProperty(value = "冷却方式") // @ApiModelProperty(value = "冷却方式")
private String coolingMethod; // private String coolingMethod;
//
@ApiModelProperty(value = "备案完成时间") // @ApiModelProperty(value = "备案完成时间")
private String filingCompletionTime; // private String filingCompletionTime;
//
@ApiModelProperty(value = "备注") // @ApiModelProperty(value = "备注")
private String remark; // private String remark;
@Override @Override