Euni4U/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整查询

Browse Source
This commit is contained in:
Flow 2025-09-01 10:34:30 +08:00
parent 53b9d01399
commit 473980b028
6 changed files with 68 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DevicePageReqVO.java
View File

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

14
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceRespVO.java
View File

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

11
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/device/vo/DeviceSaveReqVO.java
View File

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

15
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/device/DeviceDO.java
View File

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

6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/device/DeviceMapper.java
View File

@ -44,6 +44,9 @@ public interface DeviceMapper extends BaseMapperX<DeviceDO> {
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<DeviceDO> {
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);
}

15
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/person/PersonMapper.java
View File

@ -19,13 +19,12 @@ import org.apache.ibatis.annotations.Param;
public interface PersonMapper extends BaseMapperX<PersonDO> {
default PageResult<PersonDO> selectPage(PersonPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PersonDO>()
LambdaQueryWrapperX<PersonDO> wrapper = new LambdaQueryWrapperX<PersonDO>()
.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<PersonDO> {
.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<PersonDO> selectPageNoFamilyid(PersonPageReqVO reqVO) {