From 129a317ff36d49fcc096cdd60d066594176e9e0e Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 02 二月 2024 08:37:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/domain/RmRepairRecord.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/domain/RmRepairRecord.java b/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/domain/RmRepairRecord.java
index 92b0ad0..6c39f5b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/domain/RmRepairRecord.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/rm/repairRecord/domain/RmRepairRecord.java
@@ -1,9 +1,19 @@
package com.jcdm.main.rm.repairRecord.domain;
+import com.alibaba.excel.annotation.ExcelIgnore;
+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 lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;
+
+import java.util.List;
/**
* 杩斾慨璁板綍瀵硅薄 rm_repair_record
@@ -11,6 +21,11 @@
* @author Yi
* @date 2023-12-22
*/
+@Data
+@ExcelIgnoreUnannotated
+@ColumnWidth(16)
+@HeadRowHeight(14)
+@HeadFontStyle(fontHeightInPoints = 11)
public class RmRepairRecord extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -24,22 +39,35 @@
/** 杩斾慨鏍囪瘑 */
@Excel(name = "杩斾慨鏍囪瘑")
+ @ExcelProperty(value = "杩斾慨鏍囪瘑", index = 0)
private String repairIdentification;
/** 绠变綋缂栫爜 */
@Excel(name = "绠变綋缂栫爜")
+ @ExcelProperty(value = "绠变綋缂栫爜", index = 1)
private String boxCode;
+
+ @TableField(exist = false)
+ @ExcelIgnore
+ private List<String> engineNoList;
+
+ @TableField(exist = false)
+ @ExcelIgnore
+ private List<String> engineNoListExcel;
/** 宸ュ簭缂栫爜 */
@Excel(name = "宸ュ簭缂栫爜")
+ @ExcelProperty(value = "宸ュ簭缂栫爜", index = 2)
private String processesCode;
/** 鍘熺粨鏋� */
@Excel(name = "鍘熺粨鏋�")
+ @ExcelProperty(value = "鍘熺粨鏋�", index = 3)
private String originalResult;
/** 鍒涘缓鐢ㄦ埛 */
@Excel(name = "鍒涘缓鐢ㄦ埛")
+ @ExcelProperty(value = "鍒涘缓鐢ㄦ埛", index = 5)
private String createUser;
/** 鏇存柊鐢ㄦ埛 */
@@ -48,6 +76,7 @@
/** 杩斾慨缁撴灉 */
@Excel(name = "杩斾慨缁撴灉")
+ @ExcelProperty(value = "杩斾慨缁撴灉", index = 4)
private String repairResults;
/** 鐘舵�� */
--
Gitblit v1.9.3