aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelineMoController.java
@@ -64,7 +64,7 @@ @Operation(summary = "导入管路手工气体工单数据", description = "批量导入") @Log(title = "导入管路手工气体工单数据", businessType = BusinessType.IMPORT) // @RequiresPermissions("gasPipeline:mo:import") @RequiresPermissions("gasPipeline:mo:import") @PostMapping("/importData") public AjaxResult importData(MultipartFile file) throws Exception {
@@ -62,7 +62,7 @@ @Operation(summary = "导入手工气体预测数据", description = "批量导入") @Log(title = "导入手工气体预测数据", businessType = BusinessType.IMPORT) // @RequiresPermissions("gasPipeline:prediction:import") @RequiresPermissions("gasPipeline:prediction:import") @PostMapping("/importData") public AjaxResult importData(MultipartFile file) throws Exception {
@@ -46,10 +46,10 @@ @Schema(description = "料号") private String materialCode; /** 计划完工日期 */ /** 计划完工日 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "计划完工日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Schema(description = "计划完工日期") @Excel(name = "计划完工日", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Schema(description = "计划完工日") private Date planEnd; /** 数量 */ aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialProductGroupManagement.java
@@ -1,14 +1,12 @@ package com.aps.core.domain; import com.aps.common.core.annotation.Excel; import com.aps.common.core.web.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.aps.common.core.annotation.Excel; import org.springframework.data.annotation.Id; /** @@ -31,7 +29,7 @@ /** * 适用工厂 参考 aps_factory */ @Excel(name = "适用工厂 参考 aps_factory") @Excel(name = "适用工厂") @Schema(description = "适用工厂 参考 aps_factory") private String factory; @@ -45,20 +43,26 @@ /** * 专业 参考 aps_domain */ @Excel(name = "专业 参考 aps_domain") @Excel(name = "专业归属") @Schema(description = "专业 参考 aps_domain") private String domain; /** * 是否为主阶 是/否 */ @Excel(name = "是否为主阶 是/否") @Excel(name = "是否主阶料号") @Schema(description = "是否为主阶 是/否") private String isMain; @JsonIgnore @TableField(exist = false) private String key; /** * 料号类别 制造件/采购件 */ @Excel(name = "料号类别") @Schema(description = "料号类别 制造件/采购件") private String materialType; @JsonIgnore public String getKey() { @@ -66,76 +70,5 @@ key = getFactory() + "##" + getMaterialCode(); } return key; } /** * 料号类别 制造件/采购件 */ @Excel(name = "料号类别 制造件/采购件") @Schema(description = "料号类别 制造件/采购件") private String materialType; public void setId(Long id) { this.id = id; } public Long getId() { return id; } public void setFactory(String factory) { this.factory = factory; } public String getFactory() { return factory; } public void setMaterialCode(String materialCode) { this.materialCode = materialCode; } public String getMaterialCode() { return materialCode; } public void setDomain(String domain) { this.domain = domain; } public String getDomain() { return domain; } public void setIsMain(String isMain) { this.isMain = isMain; } public String getIsMain() { return isMain; } public void setMaterialType(String materialType) { this.materialType = materialType; } public String getMaterialType() { return materialType; } @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) .append("factory", getFactory()) .append("materialCode", getMaterialCode()) .append("domain", getDomain()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("isMain", getIsMain()) .append("materialType", getMaterialType()) .toString(); } } aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelinePredictionServiceImpl.java
@@ -110,15 +110,15 @@ item.setCreateBy(SecurityUtils.getUsername()); item.setCreateTime(DateUtils.getNowDate()); }); Collections.reverse(list); list = list.stream().filter(item -> { item.setKey(null); if (!keys.contains(item.getKey())) { keys.add(item.getKey()); return true; for (int i = list.size() - 1; i >= 0; --i) { list.get(i).setKey(null); if (!keys.contains(list.get(i).getKey())) { keys.add(list.get(i).getKey()); } else { list.remove(i); } return false; }).collect(Collectors.toList()); } if (!list.isEmpty()) { List<Map<String, Object>> facCodeKey = apsGasPipelinePredictionMapper.selectByFacOrMaterial(keys); aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsMaterialProductGroupManagementServiceImpl.java
@@ -115,17 +115,14 @@ item.setCreateBy(SecurityUtils.getUsername()); item.setCreateTime(DateUtils.getNowDate()); }); Collections.reverse(list); list = list.stream() .filter(item -> { item.setKey(null); if (!keys.contains(item.getKey())) { keys.add(item.getKey()); return true; } return false; }) .collect(Collectors.toList()); for (int i = list.size() - 1; i >= 0; --i) { list.get(i).setKey(null); if (!keys.contains(list.get(i).getKey())) { keys.add(list.get(i).getKey()); } else { list.remove(i); } } if (!list.isEmpty()) { Set<String> facCodeKey = apsMaterialProductGroupManagementMapper.selectByFacOrMaterial(keys);
