修改

hdy

2025-02-27 bf5dcc46de28c2ca664be4c6c3566e0a82c1ecd6

 billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java

@@ -1,12 +1,18 @@
package com.billion.main.da.domain;

import java.util.Date;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import com.billion.common.annotation.Excel;
import com.billion.main.common.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.billion.common.annotation.Excel;
import com.billion.main.common.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

/**
 * 参数采集对象 da_param_collection
@@ -15,6 +21,10 @@
 * @date 2024-11-20
 */
@Data
@ExcelIgnoreUnannotated
@ColumnWidth(16)
@HeadRowHeight(14)
@HeadFontStyle(fontHeightInPoints = 11)
public class DaParamCollection extends BaseEntity
{
    private static final long serialVersionUID = 1L;
@@ -22,30 +32,329 @@
    /** 主键id */
    private Long id;

    /** 工单编号 */
    @Excel(name = "工单编号")
    private String workOrderNo;

    private String repairFlag;

    /** 总成序列号 */
    @Excel(name = "总成序列号")
    @Excel(name = "箱体编码")
    private String sfcCode;

    /** 工位编码 */
    @Excel(name = "工位编码")
    /** 产品编号 */
    @Excel(name = "产品编号")
    private String productCode;

    /** 产线编号 */
    @Excel(name = "产线编号")
    private String productionLine;

    /** 工位编号 */
    @Excel(name = "工位编号")
    private String locationCode;

    /** 设备编号 */
    @Excel(name = "设备编号")
    private String equipmentNo;

    /** 参数编码 */
    @Excel(name = "参数编码")
    private String paramCode;

    /** 参数名称 */
    @Excel(name = "参数名称")
    private String paramName;

    /** 参数值 */
    @Excel(name = "参数值")
    private String paramValue;

    /** 参数上限 */
    @Excel(name = "参数上限")
    private String paramUpper;

    /** 参数下限 */
    @Excel(name = "参数下限")
    private String paramLower;

    /** 标准值 */
    @Excel(name = "标准值")
    private String paramStandard;

    /** 采集时间 */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date collectTime;
    @Excel(name = "采集时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date collectionTime;

    /** 预留字段1 */
    private String spareField1;

    /** 预留字段2 */
    private String spareField2;

    /** 创建用户 */
    private String createUser;

    /** 更改用户 */
    private String updateUser;

    /** 状态（1合格、2不合格） */
    @Excel(name = "状态", readConverterExp = "1=合格、2不合格")
    private String state;

    /** 参数名称 */
    @Excel(name = "参数名称")
    private String paramName;

    /** 单位 */
    @Excel(name = "单位")
    private String unit;

    /** 类型 */
    @Excel(name = "类型")
    private String type;

    private String[] dateConditions;

    private String startTime;

    private String endTime;

    public String[] getDateConditions() {
        return dateConditions;
    }

    public void setDateConditions(String[] dateConditions) {
        this.dateConditions = dateConditions;
    }

    public String getStartTime() {return startTime;}

    public void setStartTime(String startTime) {
        this.startTime = startTime;
    }

    public String getEndTime() {
        return endTime;
    }

    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }
    public void setId(Long id)
    {
        this.id = id;
    }

    public Long getId()
    {
        return id;
    }
    public void setWorkOrderNo(String workOrderNo)
    {
        this.workOrderNo = workOrderNo;
    }

    public String getWorkOrderNo()
    {
        return workOrderNo;
    }
    public void setSfcCode(String sfcCode)
    {
        this.sfcCode = sfcCode;
    }

    public String getSfcCode()
    {
        return sfcCode;
    }
    public void setProductCode(String productCode)
    {
        this.productCode = productCode;
    }

    public String getProductCode()
    {
        return productCode;
    }
    public void setProductionLine(String productionLine)
    {
        this.productionLine = productionLine;
    }

    public String getProductionLine()
    {
        return productionLine;
    }
    public void setLocationCode(String locationCode)
    {
        this.locationCode = locationCode;
    }

    public String getLocationCode()
    {
        return locationCode;
    }
    public void setEquipmentNo(String equipmentNo)
    {
        this.equipmentNo = equipmentNo;
    }

    public String getEquipmentNo()
    {
        return equipmentNo;
    }
    public void setParamCode(String paramCode)
    {
        this.paramCode = paramCode;
    }

    public String getParamCode()
    {
        return paramCode;
    }
    public void setParamValue(String paramValue)
    {
        this.paramValue = paramValue;
    }

    public String getParamValue()
    {
        return paramValue;
    }
    public void setParamUpper(String paramUpper)
    {
        this.paramUpper = paramUpper;
    }

    public String getParamUpper()
    {
        return paramUpper;
    }
    public void setParamLower(String paramLower)
    {
        this.paramLower = paramLower;
    }

    public String getParamLower()
    {
        return paramLower;
    }
    public void setParamStandard(String paramStandard)
    {
        this.paramStandard = paramStandard;
    }

    public String getParamStandard()
    {
        return paramStandard;
    }
    public void setCollectionTime(Date collectionTime)
    {
        this.collectionTime = collectionTime;
    }

    public Date getCollectionTime()
    {
        return collectionTime;
    }
    public void setSpareField1(String spareField1)
    {
        this.spareField1 = spareField1;
    }

    public String getSpareField1()
    {
        return spareField1;
    }
    public void setSpareField2(String spareField2)
    {
        this.spareField2 = spareField2;
    }

    public String getSpareField2()
    {
        return spareField2;
    }
    public void setCreateUser(String createUser)
    {
        this.createUser = createUser;
    }

    public String getCreateUser()
    {
        return createUser;
    }
    public void setUpdateUser(String updateUser)
    {
        this.updateUser = updateUser;
    }

    public String getUpdateUser()
    {
        return updateUser;
    }
    public void setState(String state)
    {
        this.state = state;
    }

    public String getState()
    {
        return state;
    }
    public void setParamName(String paramName)
    {
        this.paramName = paramName;
    }

    public String getParamName()
    {
        return paramName;
    }
    public void setUnit(String unit)
    {
        this.unit = unit;
    }

    public String getUnit()
    {
        return unit;
    }
    public void setType(String type)
    {
        this.type = type;
    }

    public String getType()
    {
        return type;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                .append("id", getId())
                .append("workOrderNo", getWorkOrderNo())
                .append("sfcCode", getSfcCode())
                .append("productCode", getProductCode())
                .append("productionLine", getProductionLine())
                .append("locationCode", getLocationCode())
                .append("equipmentNo", getEquipmentNo())
                .append("paramCode", getParamCode())
                .append("paramValue", getParamValue())
                .append("paramUpper", getParamUpper())
                .append("paramLower", getParamLower())
                .append("paramStandard", getParamStandard())
                .append("collectionTime", getCollectionTime())
                .append("spareField1", getSpareField1())
                .append("spareField2", getSpareField2())
                .append("createUser", getCreateUser())
                .append("createTime", getCreateTime())
                .append("updateUser", getUpdateUser())
                .append("updateTime", getUpdateTime())
                .append("state", getState())
                .append("paramName", getParamName())
                .append("unit", getUnit())
                .append("type", getType())
                .toString();
    }
}