From 7ff5e9edadf446d0d033574a7b0ae802f5ac2233 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期六, 17 二月 2024 15:36:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
index 2a9ee55..6ced182 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
@@ -2,6 +2,11 @@
import java.util.Date;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+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.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -9,6 +14,7 @@
import org.apache.commons.lang3.builder.ToStringStyle;
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 浜у搧杩囩珯閲囬泦瀵硅薄 da_passing_station_collection
@@ -17,6 +23,10 @@
* @date 2023-12-12
*/
@Data
+@ExcelIgnoreUnannotated
+@ColumnWidth(16)
+@HeadRowHeight(14)
+@HeadFontStyle(fontHeightInPoints = 11)
public class DaPassingStationCollection extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -26,22 +36,29 @@
/** 宸ュ崟缂栧彿 */
@Excel(name = "宸ュ崟缂栧彿")
+ @ExcelProperty(value = "宸ュ崟缂栧彿", index = 0)
private String workOrderNo;
+ private String repairFlag;
+
/** 鎬绘垚搴忓垪鍙� */
- @Excel(name = "鎬绘垚搴忓垪鍙�")
+ @Excel(name = "绠变綋缂栫爜")
+ @ExcelProperty(value = "绠变綋缂栫爜", index = 1)
private String sfcCode;
/** 浜у搧缂栧彿 */
@Excel(name = "浜у搧缂栧彿")
+ @ExcelProperty(value = "浜у搧缂栧彿", index = 2)
private String productCode;
/** 浜х嚎缂栧彿 */
@Excel(name = "浜х嚎缂栧彿")
+ @ExcelProperty(value = "浜х嚎缂栧彿", index = 3)
private String productionLine;
/** 宸ヤ綅缂栧彿 */
@Excel(name = "宸ヤ綅缂栧彿")
+ @ExcelProperty(value = "宸ヤ綅缂栧彿", index = 4)
private String locationCode;
/** 璁惧缂栧彿 */
@@ -51,12 +68,24 @@
/** 鍏ョ珯鏃堕棿 */
// @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍏ョ珯鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelProperty(value = "鍏ョ珯鏃堕棿", index = 5)
private Date inboundTime;
/** 鍑虹珯鏃堕棿 */
// @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍑虹珯鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelProperty(value = "鍑虹珯鏃堕棿", index = 6)
private Date outboundTime;
+
+ @TableField(exist = false)
+ private String startTime;
+
+ @TableField(exist = false)
+ private String endTime;
/** 鍏ョ珯鏄惁鍚堟牸 */
@Excel(name = "鍏ョ珯鏄惁鍚堟牸")
@@ -68,15 +97,20 @@
/** 鍑虹珯鏄惁鍚堟牸 */
@Excel(name = "鍑虹珯鏄惁鍚堟牸")
+ @ExcelProperty(value = "鏄惁鍚堟牸", index = 7)
private String outRsSign;
/** 鍑虹珯NG鍘熷洜 */
@Excel(name = "鍑虹珯NG鍘熷洜")
+ @ExcelProperty(value = "NG鍘熷洜", index = 8)
private String outMsgSign;
/** 閲囬泦鏃堕棿 */
// @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "閲囬泦鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelProperty(value = "閲囬泦鏃堕棿", index = 9)
private Date collectionTime;
/** 棰勭暀瀛楁1 */
@@ -93,6 +127,7 @@
/** 鑺傛媿鏃堕棿 */
@Excel(name = "鑺傛媿鏃堕棿")
+ @ExcelProperty(value = "鑺傛媿鏃堕棿", index = 10)
private String beatTime;
@TableField(exist = false)
--
Gitblit v1.9.3