From d61b21c50e62298f185ecafa8e0b22f7ee8c4973 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 21 八月 2025 18:13:17 +0800
Subject: [PATCH] 430报表接口与列表流程添加
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportProductHazardsDto.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportProductHazardsDto.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportProductHazardsDto.java
index 572fd4f..6517d7e 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportProductHazardsDto.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportProductHazardsDto.java
@@ -10,6 +10,8 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -26,7 +28,7 @@
@TableName("eam_report_product_hazards")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
-public class EamReportProductHazardsDto {
+public class EamReportProductHazardsDto extends FlowTaskVo implements Serializable {
/**涓婚敭*/
@TableId(type = IdType.ASSIGN_ID)
@@ -56,9 +58,14 @@
@Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
+ /**HF缂栫爜*/
+ @Excel(name = "HF缂栫爜", width = 15)
+ @ApiModelProperty(value = "HF缂栫爜")
+ private String hfCode;
/**鎿嶄綔宸�*/
@Excel(name = "鎿嶄綔宸�", width = 15)
@ApiModelProperty(value = "鎿嶄綔宸�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String confirmer;
/**鎿嶄綔宸ョ‘璁ゆ椂闂�*/
@Excel(name = "鎿嶄綔宸ョ‘璁ゆ椂闂�", width = 15, format = "yyyy-MM-dd")
@@ -69,6 +76,7 @@
/**浜у搧鎹熷け鎯呭喌*/
@Excel(name = "浜у搧鎹熷け鎯呭喌", width = 15)
@ApiModelProperty(value = "浜у搧鎹熷け鎯呭喌")
+ @Dict(dicCode = "yn")
private String productLoss;
/**浜у搧鎹熷け璐ㄩ噺褰卞搷鍒嗘瀽*/
@Excel(name = "浜у搧鎹熷け璐ㄩ噺褰卞搷鍒嗘瀽", width = 15)
@@ -77,6 +85,7 @@
/**涓荤宸ヨ壓*/
@Excel(name = "涓荤宸ヨ壓", width = 15)
@ApiModelProperty(value = "涓荤宸ヨ壓")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String technologist;
/**涓荤宸ヨ壓纭鏃堕棿*/
@Excel(name = "涓荤宸ヨ壓纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
@@ -88,9 +97,14 @@
@Excel(name = "涓荤宸ヨ壓纭鎰忚", width = 15)
@ApiModelProperty(value = "涓荤宸ヨ壓纭鎰忚")
private String technologistComment;
+ /**涓荤宸ヨ壓纭缁撴灉*/
+ @Excel(name = "涓荤宸ヨ壓纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "涓荤宸ヨ壓纭缁撴灉")
+ private String technologistResult;
/**閮ㄧ骇棰嗗*/
@Excel(name = "閮ㄧ骇棰嗗", width = 15)
@ApiModelProperty(value = "閮ㄧ骇棰嗗")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String deputyDepartment;
/**閮ㄧ骇棰嗗纭鏃堕棿*/
@Excel(name = "閮ㄧ骇棰嗗纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
@@ -102,6 +116,10 @@
@Excel(name = "閮ㄧ骇棰嗗纭鎰忚", width = 15)
@ApiModelProperty(value = "閮ㄧ骇棰嗗纭鎰忚")
private String deputyDepartmentComment;
+ /**閮ㄧ骇棰嗗纭缁撴灉*/
+ @Excel(name = "閮ㄧ骇棰嗗纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "閮ㄧ骇棰嗗纭缁撴灉")
+ private String deputyDepartmentResult;
//鍒楄〃灞曠ず
@TableField(exist = false)
private String equipmentCode;
@@ -111,4 +129,14 @@
private String equipmentModel;
@TableField(exist = false)
private String installationPosition;
+ /**鐢熶骇鍗曚綅*/
+ private String factoryName;
+ /**鏁呴殰鐜拌薄*/
+ private String faultDescription;
+ /**鎵规鍙�*/
+ private String batchNumber;
+ /**鍔犲伐闆朵欢鍙�*/
+ private String processingPart;
+ /**浠舵暟*/
+ private String quantity;
}
--
Gitblit v1.9.3