From 58f63d0e061123b15f780d294272d8a461f183db Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期三, 23 七月 2025 17:41:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportRepairDto.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportRepairDto.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportRepairDto.java new file mode 100644 index 0000000..af2f859 --- /dev/null +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportRepairDto.java @@ -0,0 +1,114 @@ +package org.jeecg.modules.eam.dto; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 鏁呴殰鎶ヤ慨Dto + * @Author: jeecg-boot + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="eam_report_repair瀵硅薄", description="鏁呴殰鎶ヤ慨") +public class EamReportRepairDto { + /**涓婚敭*/ + private String id; + /**鍒涘缓浜�*/ + private String createBy; + /**鍒涘缓鏃ユ湡*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**鏇存柊浜�*/ + @ApiModelProperty(value = "鏇存柊浜�") + private String updateBy; + /**鏇存柊鏃ユ湡*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**鍒犻櫎鏍囪*/ + @TableLogic + private Integer delFlag; + /**璁惧ID*/ + @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_name") + private String equipmentId; + /** 鎶ヤ慨鐘舵��*/ + @Dict(dicCode = "repair_status") + private String reportStatus; + /**鏄惁鍔犲伐 鍔犲伐銆佹湭鍔犲伐*/ + @Dict(dicCode = "is_processed") + private String isProcessed; + /**鏁呴殰寮�濮嬫椂闂�*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date faultStartTime; + /**鏄惁鍋滄満*/ + @Dict(dicCode = "yn") + private String breakdownFlag; + /**鏁呴殰鐜拌薄*/ + private String faultDescription; + /**鎵规鍙�*/ + private String batchNumber; + /**鍔犲伐闆朵欢鍙�*/ + private String processingPart; + /**浠舵暟*/ + private String quantity; + /**璁惧浜嬫晠 鏄惁*/ + @Dict(dicCode = "yn") + private String isAccidentsRegister; + /**搴熷搧浠跺彿*/ + private String scrapPartNumber; + /**搴熷搧浠舵暟*/ + private String scrapPartQuantity; + /**搴熷搧浠峰��*/ + private String scrapPartValue; + /**澶囨敞*/ + private String remark; + + //鍒楄〃灞曠ず + @TableField(exist = false) + private String equipmentCode; + @TableField(exist = false) + private String equipmentName; + @TableField(exist = false) + private String equipmentModel; + @TableField(exist = false) + private String installationPosition; + + /**鏄惁鏈夎澶囨搷浣滆瘉 鏄惁*/ + @Dict(dicCode = "yn") + private String operationCertificate; + /**鏄惁鏂數閲嶅惎*/ + @Dict(dicCode = "yn") + private String powerOffRestart; + /**鏄惁涓烘壒娆¢浠�*/ + @Dict(dicCode = "yn") + private String batchFirstPiece; + /**鍙樺姩鍥犵礌 鏄惁*/ + @Dict(dicCode = "yn") + private String variableFactors; + /**鍙樺姩鍥犵礌鍐呭 鍒�鍏锋洿鎹€�佸伐鑹烘洿鏀广�佸姞宸ョ▼搴忔洿鏀广�佸垁鍏疯ˉ鍋垮�兼洿鏀广��*/ + @Dict(dicCode = "variable_factors_value") + private String variableFactorsValue; + /**鎵ц绋嬪簭*/ + private String executeNc; + /**浜嬫晠鐜拌薄*/ + private String accidentPhenomenon; + /**閲囧彇鎺柦*/ + private String measure; + /**閫犳垚缁撴灉*/ + private String causingResults; + +} -- Gitblit v1.9.3