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 and ci.country_group_name =#{dto.region,jdbcType=VARCHAR} + + and sbr.region = #{dto.countryName} + and sbr.create_time BETWEEN #{dto.createTimeStart,jdbcType=TIMESTAMP} and #{dto.createTimeEnd,jdbcType=TIMESTAMP}