From 3c4ba2b058ac1fb04d1d4c4c2cf0ec7130dc8175 Mon Sep 17 00:00:00 2001
From: "XB-20210411SXIT\\Administrator" <d>
Date: Fri, 24 Sep 2021 12:27:17 +0800
Subject: [PATCH] =?UTF-8?q?1.1.0=20=E5=9C=B0=E5=9B=BE=E5=9C=B0=E5=9D=97?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/AppletsMapMapper.xml   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/air/src/main/resources/mapper/AppletsMapMapper.xml b/air/src/main/resources/mapper/AppletsMapMapper.xml
index 1f45f56..6e376be 100644
--- a/air/src/main/resources/mapper/AppletsMapMapper.xml
+++ b/air/src/main/resources/mapper/AppletsMapMapper.xml
@@ -67,7 +67,13 @@
 
     <select id="getLandListing" resultType="com.air.land.entity.LandListedLonLat">
         SELECT
-            if(date_format(b.auction_date,'%Y-%m-%d') &lt; #{nowDate},'已出让','挂牌中') transactionStatus,
+            (
+                case
+                when ll.deal = 1 then '已成交'
+                when date_format(ll.auction_date,'%Y-%m-%d') >= #{nowDate} and ll.deal is null then '挂牌中'
+                when date_format(ll.auction_date,'%Y-%m-%d') &lt; #{nowDate} and ll.deal is null then '已成交'
+                end
+            ) transactionStatus ,
             a.*
         FROM
             land_listed_lon_lat a
@@ -81,7 +87,13 @@
 
     <select id="getLandList" resultType="com.air.land.entity.LandListedLonLat">
         SELECT
-            if(date_format(b.auction_date,'%Y-%m-%d') &lt; #{nowDate},'已出让','挂牌中') transactionStatus,
+            (
+                case
+                when ll.deal = 1 then '已成交'
+                when date_format(ll.auction_date,'%Y-%m-%d') >= #{nowDate} and ll.deal is null then '挂牌中'
+                when date_format(ll.auction_date,'%Y-%m-%d') &lt; #{nowDate} and ll.deal is null then '已成交'
+                end
+            ) transactionStatus ,
             a.*
         FROM
             land_listed_lon_lat a