From 31a780518ae8d30ebadc6c87818649c0bd19ed5c Mon Sep 17 00:00:00 2001 From: Ziin Date: Mon, 7 Jul 2025 13:24:46 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=20owner=5FId=20=E4=B8=BA?= =?UTF-8?q?=20user=5FId,=E5=92=8C=E4=B8=BB=E6=92=AD=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/bigbrother/BigBrotherController.java | 2 ++ .../admin/bigbrother/vo/BigBrotherPageReqVO.java | 2 +- .../admin/bigbrother/vo/BigBrotherRespVO.java | 2 +- .../admin/bigbrother/vo/BigBrotherSaveReqVO.java | 2 +- .../dal/dataobject/bigbrother/BigBrotherDO.java | 2 +- .../mapper/bigbrother/BigBrotherMapper.xml | 14 +++++++------- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/BigBrotherController.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/BigBrotherController.java index a9594d7..8704c78 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/BigBrotherController.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/BigBrotherController.java @@ -104,4 +104,6 @@ public class BigBrotherController { BeanUtils.toBean(list, BigBrotherRespVO.class)); } + + } \ No newline at end of file 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 1408a85..46fcc7b 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 @@ -49,7 +49,7 @@ public class BigBrotherPageReqVO extends PageParam { private String hostDisplayId; @Schema(description = "该数据所属的账号id", example = "30487") - private String ownerId; + private String userId; /** diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherRespVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherRespVO.java index be1ebe7..b0fbefa 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherRespVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherRespVO.java @@ -62,7 +62,7 @@ public class BigBrotherRespVO { @Schema(description = "该数据所属的账号id", example = "30487") @ExcelProperty("该数据所属的账号id") - private String ownerId; + private String userId; @Schema(description = "创建时间") @ExcelProperty("创建时间") diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherSaveReqVO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherSaveReqVO.java index a3c39b5..3db6cae 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherSaveReqVO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/controller/admin/bigbrother/vo/BigBrotherSaveReqVO.java @@ -47,6 +47,6 @@ public class BigBrotherSaveReqVO { private String hostDisplayId; @Schema(description = "该数据所属的账号id", example = "30487") - private String ownerId; + private String userId; } \ No newline at end of file diff --git a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/bigbrother/BigBrotherDO.java b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/bigbrother/BigBrotherDO.java index 671873e..303347c 100644 --- a/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/bigbrother/BigBrotherDO.java +++ b/tkdata-model-server/src/main/java/cn/iocoder/yudao/module/tkdata/dal/dataobject/bigbrother/BigBrotherDO.java @@ -74,7 +74,7 @@ public class BigBrotherDO extends BaseDO { /** * 该数据所属的账号id */ - private String ownerId; + private String userId; /** * 该数据所属的租户id 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 06d1cb2..30c8bc6 100644 --- a/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml +++ b/tkdata-model-server/src/main/resources/mapper/bigbrother/BigBrotherMapper.xml @@ -24,7 +24,7 @@ - + @@ -58,30 +58,30 @@ and sbr.display_id like concat(#{dto.displayId,jdbcType=VARCHAR},'%') - + and sbr.hostcoins >=#{dto.hostcoinsMin,jdbcType=INTEGER} - + and sbr.hostcoins <=#{dto.hostcoinsMax,jdbcType=INTEGER} and sbr.hostcoins between #{dto.hostcoinsMin,jdbcType=INTEGER} and #{dto.hostcoinsMax,jdbcType=INTEGER} - + and sbr.total_gift_coins >=#{dto.totalGiftCoinsMin,jdbcType=INTEGER} - + and sbr.total_gift_coins <=#{dto.totalGiftCoinsMax,jdbcType=INTEGER} and sbr.total_gift_coins between #{dto.totalGiftCoinsMin,jdbcType=INTEGER} and #{dto.totalGiftCoinsMax,jdbcType=INTEGER} - + and sbr.level >=#{dto.levelMin,jdbcType=INTEGER} - + and sbr.level <=#{dto.levelMax,jdbcType=INTEGER}