From 9bafedb6e78853c94bcf0ff9a2e9db30c0866611 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 12 Dec 2023 18:56:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=B4=E6=97=B6=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95-=E6=96=B0=E5=A2=9E=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5=20=E7=BF=BB=E8=AF=91?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/EnterpriseStandardAuthUserMapper.xml      | 7 +++++--
 .../laws/standard/controller/TempAuthRecordQueryDto.java | 9 +++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml
index 8226da27..cef8d908 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardAuthUserMapper.xml
@@ -27,6 +27,7 @@
             auth.id AS Id,
             auth.auth_user AS authUser,
             auth.auth_dept AS authDept,
+            auth.create_time AS createTime,
             auth.standard_id AS standardId,
             es.standard_number AS standardNumber,
             auth.auth_expire_date AS authExpireDate
@@ -37,7 +38,8 @@
                     NULL AS auth_user,
                     auth_dept,
                     standard_id,
-                    auth_expire_date
+                    auth_expire_date,
+                    create_time
                 FROM
                     laws_enterprise_standard_auth_dept
                 WHERE
@@ -48,7 +50,8 @@
                     auth_user,
                     NULL AS auth_dept,
                     standard_id,
-                    auth_expire_date
+                    auth_expire_date,
+                    create_time
                 FROM
                     laws_enterprise_standard_auth_user
             ) AS auth
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java
index d278a8bc..7f6687ca 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/TempAuthRecordQueryDto.java
@@ -2,6 +2,7 @@ package com.jero.modules.laws.standard.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -31,6 +32,12 @@ public class TempAuthRecordQueryDto {
     @ApiModelProperty(value = "授权到期日期")
     private Date authExpireDate;
 
+    /**授权日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "授权日期")
+    private Date createTime;
+
     /**授权到期日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
@@ -44,10 +51,12 @@ public class TempAuthRecordQueryDto {
     private Date endAuthExpireDate;
 
     /**授权部门*/
+    @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
     @ApiModelProperty(value = "授权部门")
     private String authDept;
 
     /**授权人员*/
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     @ApiModelProperty(value = "授权人员")
     private String authUser;