From 3e015ac614a23fa282427b5de5c21741977eb428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 30 Aug 2024 15:43:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shipinquan/content/app/AppShipinquanController.java | 3 ++- src/main/resources/mapper/artificer/OrdersDao.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java b/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java index 52fb417..f9ac5b8 100644 --- a/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java +++ b/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java @@ -38,12 +38,13 @@ public class AppShipinquanController { @GetMapping("/list") @ApiOperation("获取视频数据列表") - public Result list(Integer page, Integer limit, String userId,String gzrId,String longitude,String latitude){ + public Result list(Integer page, Integer limit, Long createBy,String userId,String gzrId,String longitude,String latitude){ if(page==null){ page=1; limit=10; } BlShipinquan entity = new BlShipinquan(); + entity.setCreateBy(createBy); entity.setUserId(userId); entity.setLongitude(longitude); entity.setLatitude(latitude); diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml index 7e164d1..1fc3798 100644 --- a/src/main/resources/mapper/artificer/OrdersDao.xml +++ b/src/main/resources/mapper/artificer/OrdersDao.xml @@ -716,7 +716,7 @@ and o.status in (2,3,4,5,6,7,8,9) - and o.status in (2,4,6,7,8,9) + and o.status in (2,6,7,8,9) and o.pay_time is not null and date_format(o.serve_time,'%Y-%m-%d') >= date_format(#{startTime},'%Y-%m-%d')