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

优化

This commit is contained in:
mashuai 2024-12-06 18:25:13 +08:00
parent e1bd7a2e14
commit 33b7aa480d
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/vo/MaLeaseVo.java
View File

@ -32,6 +32,11 @@ public class MaLeaseVo extends MaLeaseInfo {
@ApiModelProperty(value = "租赁需求状态名称") @ApiModelProperty(value = "租赁需求状态名称")
private String leaseStatusName; private String leaseStatusName;
/**
* 预估租期（天）
*/
private Integer leaseDay;
@ApiModelProperty(value = "装备一级类目Id") @ApiModelProperty(value = "装备一级类目Id")
private String firstId; private String firstId;

14
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml
View File

@ -246,7 +246,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b2.name as cityName, b2.name as cityName,
m.area_code as areaCode, m.area_code as areaCode,
b.name as areaName, b.name as areaName,
m.address as address m.address as address,
CASE
WHEN DATE(m.lease_end_time) = DATE(m.lease_start_time) THEN 1
ELSE TIMESTAMPDIFF(DAY, m.lease_start_time, m.lease_end_time) + 1
END AS leaseDay
FROM FROM
ma_lease_info m ma_lease_info m
LEFT JOIN base_address b ON b.code = m.area_code LEFT JOIN base_address b ON b.code = m.area_code
@ -272,12 +276,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="startTime != '' and startTime == 'DESC'"> <if test="startTime != '' and startTime == 'DESC'">
,m.start_time DESC ,m.start_time DESC
</if> </if>
<!--<if test="rentDay != null and rentDay == 'ASC'"> <if test="rentDay != null and rentDay == 'ASC'">
,m.lease_day ,leaseDay
</if> </if>
<if test="rentDay != null and rentDay == 'DESC'"> <if test="rentDay != null and rentDay == 'DESC'">
,m.lease_day DESC ,leaseDay DESC
</if>--> </if>
<if test="endTime != '' and endTime == 'ASC'"> <if test="endTime != '' and endTime == 'ASC'">
,m.end_time ,m.end_time
</if> </if>