From 1fd2c5a50bd375525603ca817938107dfc5c5395 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期一, 06 十一月 2023 13:38:22 +0800 Subject: [PATCH] # 空字符串判断 --- server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java | 1 + server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java index 70954dc..24194e2 100644 --- a/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java +++ b/server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java @@ -45,4 +45,7 @@ @ApiModelProperty(value = "鐜板満鎻忚堪") @ExcelColumn(name="鐜板満鎻忚堪") private String content; + + @ApiModelProperty(value = "澶勭悊澶囨敞") + private String dealInfo; } diff --git a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java index 75240e6..d9371e5 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/BikeRepairServiceImpl.java @@ -130,6 +130,7 @@ if (Objects.nonNull(pageWrap.getModel().getEndDate())) { queryWrapper.le(BikeRepair::getCreateDate,Utils.Date.getEnd(pageWrap.getModel().getEndDate())); } + queryWrapper.orderByDesc(BikeRepair::getCreateDate); return PageData.from(bikeRepairJoinMapper.selectJoinPage(page, BikeRepairDTO.class,queryWrapper)); } -- Gitblit v1.9.3