sczx_group/sczx_order
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单列表增加实际还车时间

Browse Source
This commit is contained in:
zhangli
2025-08-09 00:02:11 +08:00
parent 414d107e21
commit badedc1e9f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/sczx/order/dto/OrderSimpleDTO.java
View File

@ -1,16 +1,11 @@
package com.sczx.order.dto; package com.sczx.order.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.sczx.order.thirdpart.dto.CarModelSimpleDTO;
import com.sczx.order.thirdpart.dto.CompanyStoreDTO;
import com.sczx.order.thirdpart.dto.RentBatteyRuleDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
/** /**
* @Author: 张黎 * @Author: 张黎
@ -64,5 +59,9 @@ public class OrderSimpleDTO {
@ApiModelProperty("还车时间") @ApiModelProperty("还车时间")
private LocalDateTime endRentTime; private LocalDateTime endRentTime;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("实际还车时间")
private LocalDateTime actEndRentTime;
} }

1
src/main/resources/mapper/OrderMainMapper.xml
View File

@ -24,6 +24,7 @@
o.order_status, o.order_status,
o.first_order_time, o.first_order_time,
o.end_rent_time, o.end_rent_time,
o.act_end_rent_time,
o.car_model_id, o.car_model_id,
o.vehicle_id, o.vehicle_id,
c.license_plate, c.license_plate,