From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java
index 5146352..5c6678e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateDetail.java
@@ -1,12 +1,11 @@
package org.jeecg.modules.eam.entity;
import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -27,21 +26,28 @@
public class OperationCertificateDetail extends JeecgEntity implements Serializable {
private static final long serialVersionUID = 1L;
-
+ @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 happenDate;
/**璇佷功ID*/
@ApiModelProperty(value = "璇佷功ID")
private String operationCertificateId;
/**绫诲瀷*/
@Excel(name = "绫诲瀷", width = 15)
@ApiModelProperty(value = "绫诲瀷")
+ @Dict(dicCode = "certificate_change_type")
private String type;
/**璁惧id*/
@Excel(name = "璁惧id", width = 15)
@ApiModelProperty(value = "璁惧id")
+ @Dict(dictTable = "mom_eam_equipment", dicText = "num", dicCode = "id")
private String equipmentId;
/**鎵ｅ垎椤�*/
@Excel(name = "鎵ｅ垎椤�", width = 15)
@ApiModelProperty(value = "鎵ｅ垎椤�")
+ @Dict(dictTable = "mom_eam_base_deduction_item", dicText = "content", dicCode = "id")
private String deductionItem;
/**鎵ｅ垎鍛ㄦ湡*/
@Excel(name = "鎵ｅ垎鍛ㄦ湡", width = 15)
@@ -68,4 +74,17 @@
@Excel(name = "灞炴�у瓧娈�5", width = 15)
@ApiModelProperty(value = "灞炴�у瓧娈�5")
private String uda5;
+
+
+ @ApiModelProperty(value = "鎵ｉ櫎鍒嗘暟")
+ @TableField(exist = false)
+ private Integer deductionScore;
+
+ @ApiModelProperty(value = "鎵ｅ垎椤瑰唴瀹�")
+ @TableField(exist = false)
+ private String deductionScoreName;
+
+ @ApiModelProperty(value = "鎵ｅ垎璁惧")
+ @TableField(exist = false)
+ private String equipmentName;
}
--
Gitblit v1.9.3