平台件SQL，添加字段

2023-10-09 10:28:18 +08:00
parent 628ba01f76
commit 46cfb10d9f
3 changed files with 143 additions and 0 deletions
@@ -1068,6 +1068,8 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			wrapper.in(TopProjectEO::getCreateBy,loginUser.getUsername()).in(TopProjectEO::getProjectLibraryBaseId,idList).orderByDesc(TopProjectEO::getSort);
 			topProjectEOList = iTopProjectEOService.list(wrapper);
 		}
+		//目标市场数据字典
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
 		for(ProjectLibraryBase projectLibraryBase: result){
 			//处理品牌
 			List<SysDictItem> sysDictItemList = dictItemList.stream()
@@ -1094,6 +1096,16 @@ public class PlatformProjectLibraryBaseServiceImpl extends ServiceImpl<PlatformP
 			}else{
 				projectLibraryBase.setSort("0");
 			}
+
+			//目标市场
+			Map<String,Object> 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"))){
@@ -164,6 +164,106 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
    @ApiModelProperty(value = "平台件数据标识，platform = YES，为平台件数据，platform为空是项目库数据")
    private String platform;

+    //平台件项目库字段--------------------------------------------------------------------------------------------------------------
+
+    @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
    public int compareTo(ProjectLibraryBase o) {
        if (!this.getProjectName().equals(o.getProjectName())) {