From 9b015b51b72ba050b4c38a6ba79eb45b7065e67d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 25 七月 2024 10:11:52 +0800
Subject: [PATCH] 调整sql

---
 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;
 	/**鎵e垎椤�*/
 	@Excel(name = "鎵e垎椤�", width = 15)
     @ApiModelProperty(value = "鎵e垎椤�")
+    @Dict(dictTable = "mom_eam_base_deduction_item", dicText = "content", dicCode = "id")
     private String deductionItem;
 	/**鎵e垎鍛ㄦ湡*/
 	@Excel(name = "鎵e垎鍛ㄦ湡", width = 15)
@@ -68,4 +74,17 @@
 	@Excel(name = "灞炴�у瓧娈�5", width = 15)
     @ApiModelProperty(value = "灞炴�у瓧娈�5")
     private String uda5;
+
+
+    @ApiModelProperty(value = "鎵i櫎鍒嗘暟")
+    @TableField(exist = false)
+    private Integer deductionScore;
+
+    @ApiModelProperty(value = "鎵e垎椤瑰唴瀹�")
+    @TableField(exist = false)
+    private String deductionScoreName;
+
+    @ApiModelProperty(value = "鎵e垎璁惧")
+    @TableField(exist = false)
+    private String equipmentName;
 }

--
Gitblit v1.9.3