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

zhanghl

2025-05-21 d75541110d428f61a9fe3378110248b7dd78e240

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipelinePrediction.java

@@ -2,13 +2,19 @@

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.springframework.data.annotation.Id;

import java.math.BigDecimal;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 管路手工气体预测数据对象 aps_gas_pipeline_prediction
@@ -49,4 +55,17 @@
    @Schema(description = "数量")
    private BigDecimal predictQuantity;

    @JsonIgnore
    @TableField(exist = false)
    private String key;

    @JsonIgnore
    public String getKey() {
        if (key == null && getPredictDate() != null) {
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
            key = getFactory() + "##" + getMaterialCode() + "##" + sdf.format(getPredictDate());
        }
        return key;
    }

}