Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT
This commit is contained in:
高嵩
@@ -1248,3 +1248,34 @@ MODIFY COLUMN `directory_name` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb
|
||||
MODIFY COLUMN `lot` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '批次' AFTER `directory_name`,
|
||||
MODIFY COLUMN `detection_report_location` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '检测报告位置' AFTER `experiment_file`,
|
||||
MODIFY COLUMN `explain_info` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`;
|
||||
|
||||
--添加平台件项目库字段2023-09-28
|
||||
ALTER TABLE `project_library_base`
|
||||
ADD COLUMN `power` varchar(255) NULL COMMENT '功率' AFTER `platform`,
|
||||
ADD COLUMN `producer` varchar(255) NULL COMMENT '生产商' AFTER `power`,
|
||||
ADD COLUMN `duty_depart` varchar(255) NULL COMMENT '责任部门' AFTER `producer`,
|
||||
ADD COLUMN `regulation_owner_id` varchar(255) NULL COMMENT '法规工程师' AFTER `duty_depart`,
|
||||
ADD COLUMN `engineering_interface_person` varchar(255) NULL COMMENT '工程接口人' AFTER `regulation_owner_id`,
|
||||
ADD COLUMN `brand_label` varchar(255) NULL COMMENT '名牌标签' AFTER `engineering_interface_person`,
|
||||
ADD COLUMN `product_model` varchar(255) NULL COMMENT '产品型号' AFTER `brand_label`,
|
||||
ADD COLUMN `cell_enterprise` varchar(255) NULL COMMENT '电芯生产企业' AFTER `product_model`,
|
||||
ADD COLUMN `assembly_enterprise` varchar(255) NULL COMMENT '总成生产企业' AFTER `cell_enterprise`,
|
||||
ADD COLUMN `part_number_cn` varchar(255) NULL COMMENT '零件号（国内）' AFTER `assembly_enterprise`,
|
||||
ADD COLUMN `part_number_en` varchar(255) NULL COMMENT '零件号（国外）' AFTER `part_number_cn`,
|
||||
ADD COLUMN `filing_code` varchar(255) NULL COMMENT '24位备案码' AFTER `part_number_en`,
|
||||
ADD COLUMN `supplier_code` varchar(255) NULL COMMENT '供应商代码' AFTER `filing_code`,
|
||||
ADD COLUMN `product_type_code` varchar(255) NULL COMMENT '产品类型代码' AFTER `supplier_code`,
|
||||
ADD COLUMN `battery_type_code` varchar(255) NULL COMMENT '电池类型代码' AFTER `Product_type _code`,
|
||||
ADD COLUMN `specification_code` varchar(255) NULL COMMENT '规格代码' AFTER `battery_type_code`,
|
||||
ADD COLUMN `traceability_code` varchar(255) NULL COMMENT '追溯代码' AFTER `specification_code`,
|
||||
ADD COLUMN `ymd_number` varchar(255) NULL COMMENT '生产也月日序列号' AFTER `traceability_code`,
|
||||
ADD COLUMN `size` double(255, 0) NULL COMMENT '尺寸' AFTER `ymd_number`,
|
||||
ADD COLUMN `rated_capacity` varchar(255) NULL COMMENT '额定容量' AFTER `size`,
|
||||
ADD COLUMN `nominal_voltage` varchar(255) NULL COMMENT '标称电压' AFTER `rated_capacity`,
|
||||
ADD COLUMN `rated_mass` varchar(255) NULL COMMENT '额定质量' AFTER `nominal_voltage`,
|
||||
ADD COLUMN `module_number` varchar(0) NULL COMMENT '包含模块个数' AFTER `rated_mass`,
|
||||
ADD COLUMN `connection_type` varchar(255) NULL COMMENT '模块串并联方式' AFTER `module_number`,
|
||||
ADD COLUMN `module_specification_code` varchar(255) NULL COMMENT '所用模块或单体规格代码' AFTER `connection_type`,
|
||||
ADD COLUMN `cooling_method` varchar(255) NULL COMMENT '冷却方式' AFTER `module_specification_code`,
|
||||
ADD COLUMN `filing_completion_time` datetime(0) NULL COMMENT '备案完成时间' AFTER `cooling_method`,
|
||||
ADD COLUMN `remark` varchar(1000) NULL COMMENT '备注' AFTER `filing_completion_time`;
|
||||
|
||||
+12
@@ -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"))){
|
||||
|
||||
+100
@@ -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())) {
|
||||
|
||||
Reference in New Issue
Block a user