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

Merge remote-tracking branch 'origin/master'
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:
pch 2025-01-13 12:40:22 +08:00
commit cc2594220a
5 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,12 @@ public class ClglPageReqVO extends PageParam {
@Schema(description = "用车状态", example = "2")
private Integer carStatus;
@Schema(description = "编号")
private String serialNumber;
@Schema(description = "类型")
private Integer numberType;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;

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

@ -93,6 +93,14 @@ public class ClglRespVO {
@ExcelProperty("备注")
private String carRemark;
@Schema(description = "编号", example = "编号")
@ExcelProperty("编号")
private String serialNumber;
@Schema(description = "类型", example = "类型")
@ExcelProperty("类型")
private Integer numberType;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;

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

@ -90,4 +90,10 @@ public class ClglSaveReqVO {
@Schema(description = "备注", example = "随便")
private String carRemark;
@Schema(description = "类型", example = "随便")
private Integer numberType;
@Schema(description = "编号", example = "随便")
private String serialNumber;
}

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

@ -119,5 +119,14 @@ public class ClglDO extends BaseDO {
* 备注
*/
private String carRemark;
/**
* 编号
*/
private String serialNumber;
/**
* 编号
*/
private Integer numberType;
}

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

@ -76,6 +76,8 @@ public interface ClglMapper extends BaseMapperX<ClglDO> {
.eqIfPresent(ClglDO::getCarMileage, reqVO.getCarMileage())
.eqIfPresent(ClglDO::getCarStatus, reqVO.getCarStatus())
.eqIfPresent(ClglDO::getStatus, reqVO.getStatus())
.eqIfPresent(ClglDO::getNumberType, reqVO.getNumberType())
.eqIfPresent(ClglDO::getSerialNumber, reqVO.getSerialNumber())
.betweenIfPresent(ClglDO::getCreateTime, reqVO.getCreateTime())
.eq(ClglDO::getStatus, 100) // 强制过滤 status = 100
.orderByDesc(ClglDO::getId));