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/OperationCertificateApply.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateApply.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateApply.java
index 4742e6b..eb712b9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateApply.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificateApply.java
@@ -3,14 +3,14 @@
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
-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 java.util.List;
+
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -53,6 +53,11 @@
     @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
     @ApiModelProperty(value = "鐢宠浜�")
     private String applicant;
+    /**鍔炵悊浜�*/
+    @Excel(name = "鍔炵悊浜�", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
+    @ApiModelProperty(value = "鍔炵悊浜�")
+    private String handlePerson;
 	/**瀹℃牳鐘舵��*/
 	@Excel(name = "瀹℃牳鐘舵��", width = 15, dicCode = "certificate_apply_status")
     @Dict(dicCode = "certificate_apply_status")
@@ -97,4 +102,10 @@
 	@Excel(name = "灞炴�у瓧娈�5", width = 15)
     @ApiModelProperty(value = "灞炴�у瓧娈�5")
     private String uda5;
+
+    @ExcelCollection(name="鎿嶄綔璇佺敵璇锋槑缁嗚〃")
+    @ApiModelProperty(value = "鎿嶄綔璇佺敵璇锋槑缁嗚〃")
+    @TableField(exist = false)
+    private List<OperationCertificateApplyDetail> operationCertificateApplyDetailList;
+
 }

--
Gitblit v1.9.3