From 9a9697c55fa66821cf74165ac2ae820182dae94d Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期三, 23 七月 2025 17:41:53 +0800 Subject: [PATCH] 设备维修对应接口 --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java | 198 +++++++++++++++++++++++++----------------------- 1 files changed, 103 insertions(+), 95 deletions(-) diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java index f0e3429..5a2a066 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportRepair.java @@ -1,114 +1,118 @@ package org.jeecg.modules.eam.entity; -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; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecg.common.api.vo.FileUploadResult; -import org.jeecg.common.aspect.annotation.Dict; -import org.jeecg.common.system.base.entity.JeecgEntity; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; - import java.io.Serializable; import java.util.Date; -import java.util.List; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; /** * @Description: 鏁呴殰鎶ヤ慨 - * @Author: Lius - * @Date: 2025-04-01 + * @Author: jeecg-boot + * @Date: 2025-07-17 + * @Version: V1.0 */ @Data @TableName("eam_report_repair") -@EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value = "eam_report_repair瀵硅薄", description = "鏁呴殰鎶ヤ慨") -public class EamReportRepair extends JeecgEntity implements Serializable { +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="eam_report_repair瀵硅薄", description="鏁呴殰鎶ヤ慨") +public class EamReportRepair implements Serializable { + private static final long serialVersionUID = 1L; - private static final long serialVersionUID = 3966250456529614720L; - - /** - * 璁惧ID - */ - @Excel(name = "璁惧ID", width = 15, dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code") - @ApiModelProperty(value = "璁惧ID") -// @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code") - private String equipmentId; - /** - * 璁惧鍚嶇О - */ - @Excel(name = "璁惧鍚嶇О", width = 15) - @TableField(exist = false) - @ApiModelProperty(value = "璁惧鍚嶇О") - private String equipmentName; - /** - * 鍒犻櫎鏍囪 - */ + /**涓婚敭*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "涓婚敭") + private String id; + /**鍒涘缓浜�*/ + @ApiModelProperty(value = "鍒涘缓浜�") + private String createBy; + /**鍒涘缓鏃ユ湡*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鍒涘缓鏃ユ湡") + 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") + @ApiModelProperty(value = "鏇存柊鏃ユ湡") + private Date updateTime; + /**鍒犻櫎鏍囪*/ + @Excel(name = "鍒犻櫎鏍囪", width = 15) @ApiModelProperty(value = "鍒犻櫎鏍囪") - @Dict(dicCode = "del_flag") + @TableLogic private Integer delFlag; - /** - * 鏁呴殰寮�濮嬫椂闂� - */ - @ApiModelProperty(value = "鏁呴殰寮�濮嬫椂闂�") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "鏁呴殰寮�濮嬫椂闂�", width = 15, format = "yyyy-MM-dd HH:mm:ss") - private Date faultStartTime; - /** - * 鏄惁鍋滄満 - */ - @Excel(name = "鏄惁鍋滄満", width = 15, dicCode = "breakdown_flag") - @ApiModelProperty(value = "鏄惁鍋滄満") - @Dict(dicCode = "breakdown_flag") - private String breakdownFlag; - /** - * 鏁呴殰绠�绉� - */ - @Excel(name = "鏁呴殰绠�绉�", width = 15) - @ApiModelProperty(value = "鏁呴殰绠�绉�") - private String faultName; - /** - * 鏁呴殰鍒嗙被 - */ - @Excel(name = "鏁呴殰鍒嗙被", width = 15, dicCode = "fault_reason_category") - @ApiModelProperty(value = "鏁呴殰鍒嗙被") - @Dict(dicCode = "fault_reason_category") - private String faultType; - /** - * 鏁呴殰鎻忚堪 - */ - @Excel(name = "鏁呴殰鎻忚堪", width = 15) - @ApiModelProperty(value = "鏁呴殰鎻忚堪") - private String faultDescription; - /** - * 鎶ヤ慨鐘舵�� - */ - @Excel(name = "鎶ヤ慨鐘舵��", width = 15, dicCode = "report_repair_status") + /**璁惧ID*/ + @ApiModelProperty(value = "璁惧ID") + @Excel(name = "璁惧ID", width = 15, dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_name") + @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_name") + private String equipmentId; + /** 鎶ヤ慨鐘舵��*/ @ApiModelProperty(value = "鎶ヤ慨鐘舵��") - @Dict(dicCode = "report_repair_status") + @Dict(dicCode = "repair_status") private String reportStatus; - /** - * 鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧 - */ - @Excel(name = "鐓х墖", width = 15, type = 2) - @ApiModelProperty(value = "鐓х墖") - private String imageFiles; - - /**鐓х墖*/ - @ApiModelProperty(value = "鐓х墖") - @TableField(exist = false) - private List<FileUploadResult> imageFilesResult; - - /** - * 澶囨敞 - */ - @Excel(name = "澶囨敞", width = 15) + /**鏄惁鍔犲伐 鍔犲伐銆佹湭鍔犲伐*/ + @Excel(name = "鏄惁鍔犲伐 鍔犲伐銆佹湭鍔犲伐", width = 15) + @ApiModelProperty(value = "鏄惁鍔犲伐 鍔犲伐銆佹湭鍔犲伐") + @Dict(dicCode = "is_processed") + private String isProcessed; + /**鏁呴殰寮�濮嬫椂闂�*/ + @Excel(name = "鏁呴殰寮�濮嬫椂闂�", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "鏁呴殰寮�濮嬫椂闂�") + private Date faultStartTime; + /**鏄惁鍋滄満*/ + @Excel(name = "鏄惁鍋滄満", width = 15) + @ApiModelProperty(value = "鏄惁鍋滄満") + @Dict(dicCode = "yn") + private String breakdownFlag; + /**鏁呴殰鐜拌薄*/ + @Excel(name = "鏁呴殰鐜拌薄", width = 15) + @ApiModelProperty(value = "鏁呴殰鐜拌薄") + private String faultDescription; + /**鎵规鍙�*/ + @Excel(name = "鎵规鍙�", width = 15) + @ApiModelProperty(value = "鎵规鍙�") + private String batchNumber; + /**鍔犲伐闆朵欢鍙�*/ + @Excel(name = "鍔犲伐闆朵欢鍙�", width = 15) + @ApiModelProperty(value = "鍔犲伐闆朵欢鍙�") + private String processingPart; + /**浠舵暟*/ + @Excel(name = "浠舵暟", width = 15) + @ApiModelProperty(value = "浠舵暟") + private String quantity; + /**璁惧浜嬫晠 鏄惁*/ + @Excel(name = "璁惧浜嬫晠 鏄惁", width = 15) + @ApiModelProperty(value = "璁惧浜嬫晠 鏄惁") + @Dict(dicCode = "yn") + private String isAccidentsRegister; + /**搴熷搧浠跺彿*/ + @Excel(name = "搴熷搧浠跺彿", width = 15) + @ApiModelProperty(value = "搴熷搧浠跺彿") + private String scrapPartNumber; + /**搴熷搧浠舵暟*/ + @Excel(name = "搴熷搧浠舵暟", width = 15) + @ApiModelProperty(value = "搴熷搧浠舵暟") + private String scrapPartQuantity; + /**搴熷搧浠峰��*/ + @Excel(name = "搴熷搧浠峰��", width = 15) + @ApiModelProperty(value = "搴熷搧浠峰��") + private String scrapPartValue; + /**澶囨敞*/ + @Excel(name = "澶囨敞", width = 15) @ApiModelProperty(value = "澶囨敞") private String remark; @@ -116,6 +120,10 @@ @TableField(exist = false) private String equipmentCode; @TableField(exist = false) + private String equipmentName; + @TableField(exist = false) + private String equipmentModel; + @TableField(exist = false) private String installationPosition; } -- Gitblit v1.9.3