From 99e88e155dd4c81e44e7b76eac0bc483d704f4ef Mon Sep 17 00:00:00 2001
From: liukai <35074062@qq.com>
Date: Wed, 30 Mar 2022 10:16:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pms/ocp/model/dto/ApiBaseDto.java     | 33 +++++++++++++++++++
 .../resources/mapper/OcpApiGroupMapper.xml    | 17 +++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
index 459ab74..44daecb 100644
--- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
+++ b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java
@@ -61,6 +61,15 @@ public class ApiBaseDto implements Serializable {
     @ApiModelProperty("每页条数")
     private Integer pageSize;
 
+    @ApiModelProperty("更新开始")
+    private String startMTime;
+
+    @ApiModelProperty("更新结束")
+    private String endMTime;
+
+    @ApiModelProperty("分类名称")
+    private String apiGroupName;
+
 
     private List<String> apiGroupCodeList;
 
@@ -167,4 +176,28 @@ public class ApiBaseDto implements Serializable {
     public void setApiGroupCodeList(List<String> apiGroupCodeList) {
         this.apiGroupCodeList = apiGroupCodeList;
     }
+
+    public String getStartMTime() {
+        return startMTime;
+    }
+
+    public void setStartMTime(String startMTime) {
+        this.startMTime = startMTime;
+    }
+
+    public String getEndMTime() {
+        return endMTime;
+    }
+
+    public void setEndMTime(String endMTime) {
+        this.endMTime = endMTime;
+    }
+
+    public String getApiGroupName() {
+        return apiGroupName;
+    }
+
+    public void setApiGroupName(String apiGroupName) {
+        this.apiGroupName = apiGroupName;
+    }
 }
diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml
index c6e0d11..4470599 100644
--- a/src/main/resources/mapper/OcpApiGroupMapper.xml
+++ b/src/main/resources/mapper/OcpApiGroupMapper.xml
@@ -73,10 +73,12 @@
         select
         oab.obj_id,oab.api_code,oae.api_code,oab.api_name,oae.cluster_name,
         oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime,
-        oab.api_description,oab.professional_kind
+        oab.api_description,oab.professional_kind,oab.api_mtime,oab.api_user_name,
+        oab.api_group_code,oag.api_group_name
         from ocp_api_base oab
         LEFT JOIN ocp_api_extent oae on oab.api_code = oae.api_code
         LEFT JOIN ocp_tenant_iocn oci on  oab.api_code = oci.code_no
+        LEFT JOIN ocp_api_group oag on  oab.api_group_code = oag.api_group_code
         <where>
             <if test="apiGroupCodeList !=null ">
                 and oab.api_group_code in
@@ -104,6 +106,19 @@
             <if test="keyword !=null and keyword != '' ">
                 and oab.api_name like CONCAT('%', #{keyword}::text,'%')
             </if>
+            <if test="startMTime !=null  ">
+                <![CDATA[
+                and oab.api_mtime >= #{startMTime}
+                ]]>
+            </if>
+            <if test="endMTime !=null  ">
+                <![CDATA[
+            and oab.api_mtime <= #{endMTime}
+            ]]>
+            </if>
+            <if test="apiGroupName !=null and apiGroupName!=''">
+                and oag.api_group_name = #{apiGroupName}
+            </if>
         </where>
         order by oab.api_mtime desc
     </select>
-- 
2.26.0