From 397f1fccabd2bd772e8e4b926c0001fc34e59445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Sat, 13 Jul 2024 15:19:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=84=E8=BF=91=E6=8A=80=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ArtificerServiceImpl.java | 2 +- .../resources/mapper/artificer/OrdersDao.xml | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java index e44a6fe..748c2cb 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java @@ -662,7 +662,7 @@ public class ArtificerServiceImpl extends ServiceImpl i public Result getHomeArtificerList(Integer page, Integer limit, Integer isStart,Integer status, String city, String longitude, String latitude){ Map map = new HashMap(); Page pages=new Page<>(page,limit); - IPage artificerIPage = baseMapper.selectArtificerList(pages, null, "",longitude, latitude, 1, 2, 1, status, city, null,"",1,isStart,null); + IPage artificerIPage = baseMapper.selectArtificerList(pages, null, "",longitude, latitude, 1, 2, 1, status, city, null,"",1,0,null); map.put("nearData",new PageUtils(artificerIPage)); map.put("startData",new PageUtils(baseMapper.getHomeStartArtificerList(pages,isStart,status,city))); return Result.success(map); diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml index b58cb63..308a7f3 100644 --- a/src/main/resources/mapper/artificer/OrdersDao.xml +++ b/src/main/resources/mapper/artificer/OrdersDao.xml @@ -799,7 +799,7 @@ and date_format(o.serve_time,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d') and o.status=2 - order by serve_time desc + order by serve_time desc, orders_id desc