by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(sis): 更新授权组相关实体
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
zcxlsm 2025-07-23 13:09:30 +08:00
parent 5d2aa88690
commit d540a37543
4 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthGroup.java
View File

@ -4,8 +4,6 @@ import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial; import java.io.Serial;
@ -35,14 +33,14 @@ public class SisAuthGroup extends TenantEntity {
private String name; private String name;
/** /**
* 开始时间 * 面向对象(1-单位、2-个人)
*/ */
private Date begTime; private Long groupType;
/** /**
* 结束时间 * 是否启用(0：禁用，1启用)
*/ */
private Date endTime; private Boolean isEnable;
} }

11
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthGroupBo.java
View File

@ -8,8 +8,6 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/** /**
* 授权组业务对象 sis_auth_group * 授权组业务对象 sis_auth_group
@ -35,14 +33,15 @@ public class SisAuthGroupBo extends BaseEntity {
private String name; private String name;
/** /**
* 开始时间 * 面向对象(1-单位、2-个人)
*/ */
private Date begTime; @NotNull(message = "面向对象(1-单位、2-个人)不能为空", groups = { AddGroup.class, EditGroup.class })
private Long groupType;
/** /**
* 结束时间 * 是否启用(0：禁用，1启用)
*/ */
private Date endTime; private Boolean isEnable;
} }

14
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAuthGroupVo.java
View File

@ -1,7 +1,5 @@
package org.dromara.sis.domain.vo; package org.dromara.sis.domain.vo;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.sis.domain.SisAuthGroup; import org.dromara.sis.domain.SisAuthGroup;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.ExcelProperty;
@ -43,16 +41,16 @@ public class SisAuthGroupVo implements Serializable {
private String name; private String name;
/** /**
* 开始时间 * 面向对象(1-单位、2-个人)
*/ */
@ExcelProperty(value = "开始时间") @ExcelProperty(value = "面向对象(1-单位、2-个人)")
private Date begTime; private Long groupType;
/** /**
* 结束时间 * 是否启用(0：禁用，1启用)
*/ */
@ExcelProperty(value = "结束时间") @ExcelProperty(value = "是否启用(0：禁用，1启用)")
private Date endTime; private Boolean isEnable;
} }

4
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupServiceImpl.java
View File

@ -75,8 +75,8 @@ public class SisAuthGroupServiceImpl implements ISisAuthGroupService {
LambdaQueryWrapper<SisAuthGroup> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<SisAuthGroup> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(SisAuthGroup::getId); lqw.orderByAsc(SisAuthGroup::getId);
lqw.like(StringUtils.isNotBlank(bo.getName()), SisAuthGroup::getName, bo.getName()); lqw.like(StringUtils.isNotBlank(bo.getName()), SisAuthGroup::getName, bo.getName());
lqw.eq(bo.getBegTime() != null, SisAuthGroup::getBegTime, bo.getBegTime()); lqw.eq(bo.getGroupType() != null, SisAuthGroup::getGroupType, bo.getGroupType());
lqw.eq(bo.getEndTime() != null, SisAuthGroup::getEndTime, bo.getEndTime()); lqw.eq(bo.getIsEnable() != null, SisAuthGroup::getIsEnable, bo.getIsEnable());
return lqw; return lqw;
} }