From 3baab6acbd0252c4c210fbb4d75410c900fb9e11 Mon Sep 17 00:00:00 2001
From: Ziin <hiziying@hotmail.com>
Date: Mon, 7 Jul 2025 13:00:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A4=A7=E5=93=A5=E7=AD=9B=E9=80=89=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=9B=BD=E5=AE=B6=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/bigbrother/vo/BigBrotherPageReqVO.java         | 9 ++++++---
 .../resources/mapper/bigbrother/BigBrotherMapper.xml     | 4 ++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherPageReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherPageReqVO.java
index 78d26ea..1408a85 100644
--- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherPageReqVO.java
+++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherPageReqVO.java
@@ -113,13 +113,15 @@ public class BigBrotherPageReqVO extends PageParam {
      * 数据插入时间
      */
     @Schema(description = "创建时间开始(yyyy-MM-dd)", example = "2023-01-01")
-    private Date createTimeStart;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime createTimeStart;
 
     /**
      * 数据插入时间
      */
     @Schema(description = "创建时间结束(yyyy-MM-dd)", example = "2023-01-01")
-    private Date createTimeEnd;
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime createTimeEnd;
 
     /**
      * 排序规则
@@ -133,5 +135,6 @@ public class BigBrotherPageReqVO extends PageParam {
     @Schema(description = "排序字段(historicHighCoins/totalGiftCoins/level等)", example = "hostsCoins")
     private String sortName;
 
-
+    @Schema(description = "国家名称")
+    private String countryName;
 }
\ No newline at end of file
diff --git a/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml b/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml
index ea6ba37..06d1cb2 100644
--- a/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml
+++ b/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml
@@ -41,10 +41,14 @@
             sbr.host_display_id,sbr.create_time from
             server_big_brother sbr left join server_country_info ci ON sbr.region = ci.country_name
             where sbr.tenant_id=#{dto.tenantId}
+            and sbr.deleted = 0
             <!--  大哥所属国家筛选    -->
             <if test="dto.region!= '' and dto.region != null">
                 and ci.country_group_name =#{dto.region,jdbcType=VARCHAR}
             </if>
+            <if test="dto.countryName != null and dto.countryName != ''">
+                and sbr.region = #{dto.countryName}
+            </if>
             <!--  大哥入库时间筛选    -->
             <if test="dto.createTimeStart != null and dto.createTimeEnd != null">
                 and sbr.create_time  BETWEEN #{dto.createTimeStart,jdbcType=TIMESTAMP} and #{dto.createTimeEnd,jdbcType=TIMESTAMP}