From 4864c87d65e797d2ecd827b1eca9d46aec0950aa Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 25 六月 2025 11:56:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMajorPartialRepair.java | 173 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 101 insertions(+), 72 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMajorPartialRepair.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMajorPartialRepair.java
index 147df1e..3f2674e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMajorPartialRepair.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamMajorPartialRepair.java
@@ -1,106 +1,135 @@
package org.jeecg.modules.eam.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+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.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import java.io.Serializable;
-import java.util.Date;
/**
- * @Description: 澶т慨椤逛慨
+ * @Description: eam_major_partial_repair
* @Author: jeecg-boot
- * @Date: 2025-05-13
+ * @Date: 2025-06-20
* @Version: V1.0
*/
@Data
@TableName("eam_major_partial_repair")
-@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="eam_major_partial_repair瀵硅薄", description="澶т慨椤逛慨")
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="eam_major_partial_repair瀵硅薄", description="eam_major_partial_repair")
public class EamMajorPartialRepair implements Serializable {
-
+ private static final long serialVersionUID = 1L;
+
/**涓婚敭*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
- private String id;
- /**鍒涘缓浜�*/
- @Excel(name = "鍒涘缓浜�", width = 15)
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @Excel(name = "鏇存柊浜�", width = 15)
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
- /**璁惧ID*/
- @Excel(name = "璁惧ID", width = 15)
- @ApiModelProperty(value = "璁惧ID")
- private String equipmentId;
- /**缁翠慨绫诲瀷*/
- @Excel(name = "缁翠慨绫诲瀷", width = 15)
- @ApiModelProperty(value = "缁翠慨绫诲瀷")
- private String repairType;
- /**璁″垝寮�濮嬫椂闂�*/
- @ApiModelProperty(value = "璁″垝寮�濮嬫椂闂�")
- private Date planStartTime;
- /**璁″垝缁撴潫鏃堕棿*/
- @ApiModelProperty(value = "璁″垝缁撴潫鏃堕棿")
- private Date planEndTime;
+ private String id;
/**缁翠慨缂栫爜*/
- @Excel(name = "缁翠慨缂栫爜", width = 15)
+ @Excel(name = "缁翠慨缂栫爜", width = 20)
@ApiModelProperty(value = "缁翠慨缂栫爜")
- private String repairCode;
- /**缁翠慨鍚嶇О*/
- @Excel(name = "缁翠慨鍚嶇О", width = 15)
- @ApiModelProperty(value = "缁翠慨鍚嶇О")
- private String repairName;
+ private String repairCode;
+ /**椤圭洰鍚嶇О*/
+ @Excel(name = "椤圭洰鍚嶇О", width = 20)
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ private String repairName;
/**缁翠慨鐘舵��*/
@Excel(name = "缁翠慨鐘舵��", width = 15)
@ApiModelProperty(value = "缁翠慨鐘舵��")
- private String repairStatus;
+ @Dict(dicCode = "major_partial_repair_status")
+ private String repairStatus;
+ /**缁翠慨绫诲瀷*/
+ @Excel(name = "缁翠慨绫诲瀷", width = 15)
+ @ApiModelProperty(value = "缁翠慨绫诲瀷")
+ private String repairType;
+ /**鐢宠浜�*/
+ @Excel(name = "鐢宠浜�", width = 15)
+ @ApiModelProperty(value = "鐢宠浜�")
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+ private String applicant;
+ /**鐢宠杞﹂棿*/
+ @Excel(name = "鐢宠杞﹂棿", width = 15)
+ @ApiModelProperty(value = "鐢宠杞﹂棿")
+ @Dict(dictTable = "mdc_production", dicText = "production_name", dicCode = "id")
+ private String applicantProduction;
+ /**璁″垝寮�濮嬫棩鏈�*/
+ @Excel(name = "璁″垝寮�濮嬫棩鏈�", width = 20, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
+ private Date planStartDate;
+ /**璁″垝缁撴潫鏃ユ湡*/
+ @Excel(name = "璁″垝缁撴潫鏃ユ湡", width = 20, format = "yyyy/MM/dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "璁″垝缁撴潫鏃ユ湡")
+ private Date planEndDate;
/**瀹為檯寮�濮嬫椂闂�*/
+ @Excel(name = "瀹為檯寮�濮嬫椂闂�", width = 20, format = "yyyy/MM/dd HH")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH")
@ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
- private Date actualStartTime;
+ private Date actualStartTime;
/**瀹為檯缁撴潫鏃堕棿*/
+ @Excel(name = "瀹為檯缁撴潫鏃堕棿", width = 20, format = "yyyy/MM/dd HH")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH")
@ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
- private Date actualEndTime;
+ private Date actualEndTime;
/**鎬婚噾棰�*/
@Excel(name = "鎬婚噾棰�", width = 15)
@ApiModelProperty(value = "鎬婚噾棰�")
- private java.math.BigDecimal totalAmount;
- /**闄勪欢*/
- @Excel(name = "闄勪欢", width = 15)
- @ApiModelProperty(value = "闄勪欢")
- private String attachment;
- /**缁翠慨鎻忚堪*/
- @Excel(name = "缁翠慨鎻忚堪", width = 15)
- @ApiModelProperty(value = "缁翠慨鎻忚堪")
- private String repairDescription;
- /**缁翠慨鏂瑰紡*/
- @Excel(name = "缁翠慨鏂瑰紡", width = 15)
- @ApiModelProperty(value = "缁翠慨鏂瑰紡")
- private String repairMethod;
- /**濮斿鍏徃*/
- @Excel(name = "濮斿鍏徃", width = 15)
- @ApiModelProperty(value = "濮斿鍏徃")
- private String outsourcedCompany;
+ private BigDecimal totalAmount;
+ /**鏁呴殰鎻忚堪*/
+ @Excel(name = "鏁呴殰鎻忚堪", width = 50)
+ @ApiModelProperty(value = "鏁呴殰鎻忚堪")
+ private String faultDescription;
+ /**鐢宠鍘熷洜*/
+ @Excel(name = "鐢宠鍘熷洜", width = 15)
+ @ApiModelProperty(value = "鐢宠鍘熷洜")
+ private String applicantReason;
/**璐ｄ换浜�*/
@Excel(name = "璐ｄ换浜�", width = 15)
@ApiModelProperty(value = "璐ｄ换浜�")
- private String responsiblePerson;
+ @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+ private String responsiblePerson;
+ /**澶囨敞*/
+ @Excel(name = "澶囨敞", width = 50)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+ /**鍒涘缓浜�*/
+ @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 = "鍒犻櫎鏍囪")
+ @TableLogic
+ private Integer delFlag;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "缁翠慨鏄庣粏淇℃伅")
+ private List<EamMajorPartialRepairDetail> eamMajorPartialRepairDetailList;
}
--
Gitblit v1.9.3