From cdf48e19b3c3750d2d98dfc344835ab951628696 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 12 Dec 2023 18:44:22 +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-=E8=A7=A3=E9=99=A4=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/EnterpriseStandardAuthUserMapper.xml  | 58 +++++++++++++++++--
 .../controller/TempAuthRecordQueryDto.java    | 12 ++++
 2 files changed, 66 insertions(+), 4 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 d6df62cc..8226da27 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
@@ -23,10 +23,60 @@
     </sql>
 
     <select id="tempAuthRecord" resultType="com.jero.modules.laws.standard.controller.TempAuthRecordQueryDto">
-
-
-
-
+        SELECT
+            auth.id AS Id,
+            auth.auth_user AS authUser,
+            auth.auth_dept AS authDept,
+            auth.standard_id AS standardId,
+            es.standard_number AS standardNumber,
+            auth.auth_expire_date AS authExpireDate
+        FROM
+            (
+                SELECT
+                    id,
+                    NULL AS auth_user,
+                    auth_dept,
+                    standard_id,
+                    auth_expire_date
+                FROM
+                    laws_enterprise_standard_auth_dept
+                WHERE
+                    auth_expire_date IS NOT NULL
+                UNION
+                SELECT
+                    id,
+                    auth_user,
+                    NULL AS auth_dept,
+                    standard_id,
+                    auth_expire_date
+                FROM
+                    laws_enterprise_standard_auth_user
+            ) AS auth
+        LEFT JOIN laws_enterprise_standard AS es ON auth.standard_id = es.id
+        WHERE
+	        es.del_flag = 0
+        <!--企标编号-->
+        <if test="param.standardNumber != null and param.standardNumber != ''">
+            AND es.standard_number LIKE CONCAT('%',#{param.standardNumber},'%')
+        </if>
+        <!--授权到期日期-->
+        <if test="param.startAuthExpireDate != null and param.endAuthExpireDate != ''">
+            AND auth.auth_expire_date BETWEEN #{param.startAuthExpireDate} AND #{param.endAuthExpireDate}
+        </if>
+        <!--授权部门-->
+        <if test="param.authDeptList != null and param.authDeptList.size() > 0">
+            AND auth.auth_dept IN
+            <foreach item="item" index="index" collection="param.authDeptList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <!--授权人员-->
+        <if test="param.authUserList != null and param.authUserList.size() > 0">
+            AND auth.auth_user IN
+            <foreach item="item" index="index" collection="param.authUserList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
     </select>
 
 </mapper>
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 5cafa0eb..d278a8bc 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
@@ -31,6 +31,18 @@ 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 startAuthExpireDate;
+
+    /**授权到期日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "授权到期日期结束时间")
+    private Date endAuthExpireDate;
+
     /**授权部门*/
     @ApiModelProperty(value = "授权部门")
     private String authDept;