From 33b7aa480d843e730efae7617540fd52e08a57be Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Fri, 6 Dec 2024 18:25:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/material/lease/domain/vo/MaLeaseVo.java  |  5 +++++
 .../mapper/material/lease/MaLeaseInfoMapper.xml    | 14 +++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/vo/MaLeaseVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/vo/MaLeaseVo.java
index eadba15..878693b 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/vo/MaLeaseVo.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/vo/MaLeaseVo.java
@@ -32,6 +32,11 @@ public class MaLeaseVo extends MaLeaseInfo {
     @ApiModelProperty(value = "租赁需求状态名称")
     private String leaseStatusName;
 
+    /**
+     * 预估租期（天）
+     */
+    private Integer leaseDay;
+
     @ApiModelProperty(value = "装备一级类目Id")
     private String firstId;
 
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml
index 04cf19b..d363253 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml
@@ -246,7 +246,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         b2.name as cityName,
         m.area_code as areaCode,
         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
         ma_lease_info m
         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'">
             ,m.start_time DESC
         </if>
-        <!--<if test="rentDay != null  and rentDay == 'ASC'">
-            ,m.lease_day
+        <if test="rentDay != null  and rentDay == 'ASC'">
+            ,leaseDay
         </if>
         <if test="rentDay != null  and rentDay == 'DESC'">
-            ,m.lease_day DESC
-        </if>-->
+            ,leaseDay DESC
+        </if>
         <if test="endTime != ''  and endTime == 'ASC'">
             ,m.end_time
         </if>