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;