bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

order detail improvement

This commit is contained in:
sxu 2024-12-17 10:33:35 +08:00
parent 8f30d81e35
commit 25e213e9d8
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
View File

@ -1,5 +1,6 @@
package com.bonus.material.order.domain; package com.bonus.material.order.domain;
import com.bonus.common.core.annotation.Excel;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -33,6 +34,16 @@ public class OrderDetailDto {
@ApiModelProperty(value = "设备ids") @ApiModelProperty(value = "设备ids")
private List<Integer> maIds; private List<Integer> maIds;
/** 设备编码 */
@Excel(name = "设备编码")
@ApiModelProperty(value = "设备编码")
private String code;
/** 设备唯一标识符，用户输入，比如车架号 */
@Excel(name = "设备唯一标识符")
@ApiModelProperty(value = "设备唯一标识符")
private String identifyCode;
@ApiModelProperty(value = "设备类型id") @ApiModelProperty(value = "设备类型id")
private Integer typeId; private Integer typeId;

2
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
View File

@ -155,6 +155,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectOrderDetailsById" resultType="com.bonus.material.order.domain.OrderDetailDto"> <select id="selectOrderDetailsById" resultType="com.bonus.material.order.domain.OrderDetailDto">
SELECT SELECT
mdi.device_name, mdi.device_name,
mdi.code,
mdi.identify_code,
mt.lease_price as dayLeasePrice, mt.lease_price as dayLeasePrice,
hh.order_status, hh.order_status,
hh.days, hh.days,