From 473980b02844c9ac47eb070faa9cc69ee02cea57 Mon Sep 17 00:00:00 2001 From: Flow <958079825@qq.com> Date: Mon, 1 Sep 2025 10:34:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/device/vo/DevicePageReqVO.java | 10 ++++++++++ .../controller/admin/device/vo/DeviceRespVO.java | 14 ++++++++++++++ .../admin/device/vo/DeviceSaveReqVO.java | 11 +++++++++++ .../system/dal/dataobject/device/DeviceDO.java | 15 +++++++++++++++ .../system/dal/mysql/device/DeviceMapper.java | 6 ++++++ .../system/dal/mysql/person/PersonMapper.java | 15 ++++++++++++--- 6 files changed, 68 insertions(+), 3 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DevicePageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DevicePageReqVO.java index 7a39c59d88..0a76e6ae5d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DevicePageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DevicePageReqVO.java @@ -60,5 +60,15 @@ public class DevicePageReqVO extends PageParam { @Schema(description = "是否重启") private Integer restart; + @Schema(description = "会员开始时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] vipstarttime; + + @Schema(description = "会员结束时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] vipendtime; + + @Schema(description = "是否会员") + private Integer isvip; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceRespVO.java index e59c6de053..3ac01f8a04 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceRespVO.java @@ -73,4 +73,18 @@ public class DeviceRespVO { @ExcelProperty("是否重启") private Integer restart; + @Schema(description = "会员开始时间") + @ExcelProperty("会员开始时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime vipstarttime; + + @Schema(description = "会员结束时间") + @ExcelProperty("会员结束时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime vipendtime; + + @Schema(description = "是否会员") + @ExcelProperty("是否会员") + private Integer isvip; + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceSaveReqVO.java index 0faeb4169c..5162064679 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceSaveReqVO.java @@ -59,4 +59,15 @@ public class DeviceSaveReqVO { @Schema(description = "是否重启") private Integer restart; + @Schema(description = "会员开始时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime vipstarttime; + + @Schema(description = "会员结束时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime vipendtime; + + @Schema(description = "是否会员") + private Integer isvip; + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java index de65e0596f..8efaa50154 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java @@ -96,5 +96,20 @@ public class DeviceDO { */ @TableField("restart") private Integer restart; + /** + * 会员开始时间 + */ + @TableField("vipstarttime") + private LocalDateTime vipstarttime; + /** + * 会员结束时间 + */ + @TableField("vipendtime") + private LocalDateTime vipendtime; + /** + * 是否会员 + */ + @TableField("isvip") + private Integer isvip; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java index 5857e3d615..36ea70bcd5 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java @@ -44,6 +44,9 @@ public interface DeviceMapper extends BaseMapperX { wrapper.eqIfPresent(DeviceDO::getUpdateby, reqVO.getUpdateby()); wrapper.eqIfPresent(DeviceDO::getOnlinetime, reqVO.getOnlinetime()); wrapper.eqIfPresent(DeviceDO::getRestart, reqVO.getRestart()); + wrapper.eqIfPresent(DeviceDO::getVipstarttime, reqVO.getVipstarttime()); + wrapper.eqIfPresent(DeviceDO::getVipendtime, reqVO.getVipendtime()); + wrapper.eqIfPresent(DeviceDO::getIsvip, reqVO.getIsvip()); wrapper.orderByDesc(DeviceDO::getId); return selectPage(reqVO, wrapper); @@ -66,6 +69,9 @@ public interface DeviceMapper extends BaseMapperX { wrapper.eqIfPresent(DeviceDO::getUpdateby, reqVO.getUpdateby()); wrapper.eqIfPresent(DeviceDO::getOnlinetime, reqVO.getOnlinetime()); wrapper.eqIfPresent(DeviceDO::getRestart, reqVO.getRestart()); + wrapper.eqIfPresent(DeviceDO::getVipstarttime, reqVO.getVipstarttime()); + wrapper.eqIfPresent(DeviceDO::getVipendtime, reqVO.getVipendtime()); + wrapper.eqIfPresent(DeviceDO::getIsvip, reqVO.getIsvip()); wrapper.orderByDesc(DeviceDO::getId); return selectPage(reqVO, wrapper); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/person/PersonMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/person/PersonMapper.java index 0eabbfea3c..fe5925f686 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/person/PersonMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/person/PersonMapper.java @@ -19,13 +19,12 @@ import org.apache.ibatis.annotations.Param; public interface PersonMapper extends BaseMapperX { default PageResult selectPage(PersonPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() + LambdaQueryWrapperX wrapper = new LambdaQueryWrapperX() .eqIfPresent(PersonDO::getPhone, reqVO.getPhone()) .eqIfPresent(PersonDO::getGender, reqVO.getGender()) .eqIfPresent(PersonDO::getPassword, reqVO.getPassword()) .likeIfPresent(PersonDO::getName, reqVO.getName()) .eqIfPresent(PersonDO::getAddress, reqVO.getAddress()) - .eqIfPresent(PersonDO::getOrgid, reqVO.getOrgid()) .likeIfPresent(PersonDO::getOrgname, reqVO.getOrgname()) .eqIfPresent(PersonDO::getFamilyid, reqVO.getFamilyid()) .eqIfPresent(PersonDO::getFamilyrelation, reqVO.getFamilyrelation()) @@ -35,7 +34,17 @@ public interface PersonMapper extends BaseMapperX { .betweenIfPresent(PersonDO::getUpdatetime, reqVO.getUpdatetime()) .eqIfPresent(PersonDO::getCreateby, reqVO.getCreateby()) .eqIfPresent(PersonDO::getUpdateby, reqVO.getUpdateby()) - .orderByDesc(PersonDO::getId)); + .orderByDesc(PersonDO::getId); + + // 如果传入了orgid，添加基于view_org_user视图表的子查询条件 + if (reqVO.getOrgid() != null && reqVO.getOrgid() != 999) { + wrapper.inSql(PersonDO::getId, "SELECT DISTINCT userid FROM view_org_user WHERE orgid = " + reqVO.getOrgid()); + } else { + // 如果没有orgid或为0，则直接使用orgid条件 + wrapper.eqIfPresent(PersonDO::getOrgid, reqVO.getOrgid()); + } + + return selectPage(reqVO, wrapper); } default PageResult selectPageNoFamilyid(PersonPageReqVO reqVO) {