yudao-team/oa-master
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

车辆管理
Some checks are pending
Java CI with Maven / build (11) (push) Waiting to run
Details
Java CI with Maven / build (17) (push) Waiting to run
Details
Java CI with Maven / build (8) (push) Waiting to run
Details
yudao-ui-admin CI / build (14.x) (push) Waiting to run
Details
yudao-ui-admin CI / build (16.x) (push) Waiting to run
Details

Browse Source
This commit is contained in:
XaoLi717 2024-10-29 19:50:26 +08:00
parent 7db4b89faf
commit 5aee125ba8
5 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglPageReqVO.java
View File

@ -21,8 +21,11 @@ public class ClglPageReqVO extends PageParam {
@Schema(description = "id", example = "26309")
private Long id;
@Schema(description = "申请人")
private Integer carUser;
@Schema(description = "申请人id")
private Integer carUserId;
@Schema(description = "申请人名字")
private String carUserName;
@Schema(description = "部门")
private Integer dept;

10
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglRespVO.java
View File

@ -25,9 +25,13 @@ public class ClglRespVO {
@ExcelProperty("id")
private Long id;
@Schema(description = "申请人", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("申请人")
private Integer carUser;
@Schema(description = "申请人id", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("申请人id")
private Integer carUserId;
@Schema(description = "申请人名字", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("申请人名字")
private String carUserName;
@Schema(description = "部门", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("部门")

10
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglSaveReqVO.java
View File

@ -17,9 +17,13 @@ public class ClglSaveReqVO {
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "26309")
private Long id;
@Schema(description = "申请人", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "申请人不能为空")
private Integer carUser;
@Schema(description = "申请人id", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "申请人id不能为空")
private Integer carUserId;
@Schema(description = "申请人名字", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "申请人名字不能为空")
private String carUserName;
@Schema(description = "部门", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "部门不能为空")

8
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/dataobject/clgl/ClglDO.java
View File

@ -52,9 +52,13 @@ public class ClglDO extends BaseDO {
@TableId
private Long id;
/**
* 申请人
* 申请人id
*/
private Integer carUser;
private Integer carUserId;
/**
* 申请人name
*/
private String carUserName;
/**
* 部门
*/

6
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/dal/mysql/clgl/ClglMapper.java
View File

@ -20,7 +20,8 @@ public interface ClglMapper extends BaseMapperX<ClglDO> {
default PageResult<ClglDO> selectPage(Long userId,ClglPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ClglDO>()
.eqIfPresent(ClglDO::getId, reqVO.getId())
.eqIfPresent(ClglDO::getCarUser, reqVO.getCarUser())
.eqIfPresent(ClglDO::getCarUserId, reqVO.getCarUserId())
.eqIfPresent(ClglDO::getCarUserName, reqVO.getCarUserName())
.eqIfPresent(ClglDO::getDept, reqVO.getDept())
.eqIfPresent(ClglDO::getCarType, reqVO.getCarType())
.eqIfPresent(ClglDO::getCarDriver, reqVO.getCarDriver())
@ -38,7 +39,8 @@ public interface ClglMapper extends BaseMapperX<ClglDO> {
default PageResult<ClglDO> selectPage(ClglPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ClglDO>()
.eqIfPresent(ClglDO::getId, reqVO.getId())
.eqIfPresent(ClglDO::getCarUser, reqVO.getCarUser())
.eqIfPresent(ClglDO::getCarUserId, reqVO.getCarUserId())
.eqIfPresent(ClglDO::getCarUserName, reqVO.getCarUserName())
.eqIfPresent(ClglDO::getDept, reqVO.getDept())
.eqIfPresent(ClglDO::getCarType, reqVO.getCarType())
.eqIfPresent(ClglDO::getCarDriver, reqVO.getCarDriver())