From bf5dcc46de28c2ca664be4c6c3566e0a82c1ecd6 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期四, 27 二月 2025 09:11:08 +0800
Subject: [PATCH] 修改
---
billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java | 333 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 321 insertions(+), 12 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java b/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java
index bffb776..9f235dc 100644
--- a/billion-main/src/main/java/com/billion/main/da/domain/DaParamCollection.java
+++ b/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;
+
/** 閲囬泦鏃堕棿 */
+ @Excel(name = "閲囬泦鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date collectTime;
+ 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();
+ }
}
--
Gitblit v1.9.3