From 567d0b465ebddbb03c9df3f32e50a9317a9bcaff Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Wed, 4 Dec 2024 21:19:19 +0800
Subject: [PATCH] bugfix
---
.../com/ruoyi/tc/entity/request/AssetAppPageRequest.java | 6 +++++-
.../com/ruoyi/tc/entity/request/AssetEmailPageRequest.java | 6 ++++++
.../tc/entity/request/AssetMiniProgramsPageRequest.java | 6 +++++-
.../tc/entity/request/AssetOfficialAccountPageRequest.java | 6 +++++-
ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml | 3 +++
ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml | 3 +++
.../src/main/resources/mapper/AssetMiniProgramsMapper.xml | 3 +++
.../main/resources/mapper/AssetOfficialAccountMapper.xml | 3 +++
8 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetAppPageRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetAppPageRequest.java
index 7af99d6..f6863fd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetAppPageRequest.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetAppPageRequest.java
@@ -14,7 +14,11 @@ import java.util.Date;
*/
@Data
public class AssetAppPageRequest {
-
+ /**
+ * 系统状态
+ */
+ @ApiModelProperty("系统状态")
+ private String xtzt;
/**
* 应用名称
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetEmailPageRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetEmailPageRequest.java
index 76c1acc..4c48917 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetEmailPageRequest.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetEmailPageRequest.java
@@ -28,6 +28,12 @@ public class AssetEmailPageRequest {
@ApiModelProperty("所属单位")
private String dwmc;
+ /**
+ * 系统状态
+ */
+ @ApiModelProperty("系统状态")
+ private String xtzt;
+
/**
* 开始时间
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetMiniProgramsPageRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetMiniProgramsPageRequest.java
index 0c1b11e..4daad5b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetMiniProgramsPageRequest.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetMiniProgramsPageRequest.java
@@ -14,7 +14,11 @@ import java.util.Date;
*/
@Data
public class AssetMiniProgramsPageRequest {
-
+ /**
+ * 系统状态
+ */
+ @ApiModelProperty("系统状态")
+ private String xtzt;
/**
* 小程序名称
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetOfficialAccountPageRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetOfficialAccountPageRequest.java
index aedb96c..f4338b4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetOfficialAccountPageRequest.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetOfficialAccountPageRequest.java
@@ -15,7 +15,11 @@ import java.util.Date;
@Data
public class AssetOfficialAccountPageRequest {
-
+ /**
+ * 系统状态
+ */
+ @ApiModelProperty("系统状态")
+ private String xtzt;
/**
* 公众号名称
*/
diff --git a/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml
index c693384..e2325a3 100644
--- a/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml
@@ -30,6 +30,9 @@
and create_time <= #{req.endTime}
+
+ and icp_state = #{req.xtzt}
+
order by create_time desc
diff --git a/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml
index cbfd6fb..6fdfded 100644
--- a/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml
@@ -30,6 +30,9 @@
and create_time <= #{req.endTime}
+
+ and yjxtzc = #{req.xtzt}
+
order by create_time desc
diff --git a/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml
index 80a65e2..fa41c5f 100644
--- a/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml
@@ -30,6 +30,9 @@
and create_time <= #{req.endTime}
+
+ and state = #{req.xtzt}
+
order by create_time desc
diff --git a/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml
index 7d70ba3..9f77a63 100644
--- a/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml
@@ -34,6 +34,9 @@
and create_time <= #{req.endTime}
+
+ and gzhzt = #{req.xtzt}
+
order by create_time desc