From b16d7f9fd029bf9d37bcc3c6f3cf8472a0081888 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期六, 26 七月 2025 16:34:46 +0800 Subject: [PATCH] 设备故障登记修改与产品安全确认 --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportProductHazardsDto.java | 12 +++++++++++- 1 files changed, 11 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..996fee1 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,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.modules.flowable.domain.vo.FlowTaskVo; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; @@ -26,7 +27,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) @@ -88,6 +89,10 @@ @Excel(name = "涓荤宸ヨ壓纭鎰忚", width = 15) @ApiModelProperty(value = "涓荤宸ヨ壓纭鎰忚") private String technologistComment; + /**涓荤宸ヨ壓纭缁撴灉*/ + @Excel(name = "涓荤宸ヨ壓纭缁撴灉", width = 15) + @ApiModelProperty(value = "涓荤宸ヨ壓纭缁撴灉") + private String technologistResult; /**閮ㄧ骇棰嗗*/ @Excel(name = "閮ㄧ骇棰嗗", width = 15) @ApiModelProperty(value = "閮ㄧ骇棰嗗") @@ -102,6 +107,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 +120,5 @@ private String equipmentModel; @TableField(exist = false) private String installationPosition; + } -- Gitblit v1.9.3