From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
index 2d8963c..fa7d21e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentReportRepair.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,9 +12,11 @@
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecg.common.system.base.entity.SysUpload;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -56,6 +59,11 @@
*/
private String approval;
/**
+ * 鏁呴殰鍘熷洜
+ */
+ @ApiModelProperty(value = "鏁呴殰鍘熷洜")
+ private String faultReason;
+ /**
* 鏁呴殰鎻忚堪
*/
@ApiModelProperty(value = "鏁呴殰鎻忚堪")
@@ -69,6 +77,8 @@
* 鏁呴殰鏃堕棿
*/
@ApiModelProperty(value = "鏁呴殰鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date faultTime;
/**
* 鏄惁鍋滄満
@@ -85,27 +95,28 @@
* 澶囩敤瀛楁1
*/
@ApiModelProperty(value = "澶囩敤瀛楁1")
- private String err_uda1;
+ @Dict(dicCode = "is_product")
+ private String errUda1;
/**
* 澶囩敤瀛楁2
*/
@ApiModelProperty(value = "澶囩敤瀛楁2")
- private String err_uda2;
+ private String errUda2;
/**
* 澶囩敤瀛楁3
*/
@ApiModelProperty(value = "澶囩敤瀛楁3")
- private String err_uda3;
+ private String errUda3;
/**
* 澶囩敤瀛楁4
*/
@ApiModelProperty(value = "澶囩敤瀛楁4")
- private String err_uda4;
+ private String errUda4;
/**
* 澶囩敤瀛楁5
*/
@ApiModelProperty(value = "澶囩敤瀛楁5")
- private String err_uda5;
+ private String errUda5;
/**
* 鐘舵��
*/
@@ -138,6 +149,12 @@
@ApiModelProperty(value = "鏉ユ簮Id")
private String sourceId;
+ /**
+ * qsw 2023-12-29
+ */
+ @ApiModelProperty(value = "绫诲瀷锛�1琚姩鎶ヤ慨锛�2涓诲姩鎶ヤ慨锛�3涓诲姩缁翠慨锛�")
+ private String type;
+
/*********************************************** 鎵� 灞� 瀛� 娈� ********************************************************/
/**
* 璁惧缂栧彿
@@ -150,7 +167,6 @@
*/
@TableField(exist = false)
private String equipmentName;
-
/**
* 璁惧鍨嬪彿
*/
@@ -162,10 +178,25 @@
*/
@TableField(exist = false)
private String equipmentSpecification;
-
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date acceptTime;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date finishTime;
+ private BigDecimal faultHour;
/**
* 闄勪欢涓婁紶鍒楄〃
*/
@TableField(exist = false)
private List<SysUpload> sysUploadList;
+ @TableField(exist = false)
+ private String teamId;
+ @TableField(exist = false)
+ private String partNumber;
+ @TableField(exist = false)
+ private Integer quantity;
+ @TableField(exist = false)
+ private String batchNo;
+
}
--
Gitblit v1.9.3