1.大哥筛选添加国家选项

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;
 }

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}