From 4f4538356403d620b9bd510fd45729a251291942 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 03 七月 2026 18:27:36 +0800
Subject: [PATCH] 功能开发
---
server/services/src/main/java/com/doumee/service/business/impl/ReportServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ReportServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ReportServiceImpl.java
index 500d6d9..716ba4b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ReportServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ReportServiceImpl.java
@@ -433,6 +433,8 @@
IPage<OperationOrderVO> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
OperationOrderQueryDTO model = pageWrap.getModel() == null
? new OperationOrderQueryDTO() : pageWrap.getModel();
+ // 绉熺敤涓�(status=1):闇�杩囨护鎺夋棤楠戣璁板綍鐨勮鍗�(宸叉敮浠樹絾鐢ㄦ埛浠庢湭寮�閿侀獞琛�)
+ boolean queryInProgress = Objects.nonNull(model.getStatus()) && model.getStatus().equals(Constants.ONE);
// 鈹�鈹� 姝ラ1:鍒嗛〉涓绘煡璇� 鈹�鈹�
// 涓昏〃 goodsorder left join member(鍙栨墜鏈哄彿)+ left join base_param(鍙栫粨绠楄溅鍨嬪悕);
@@ -459,6 +461,9 @@
// 璁㈠崟绫诲瀷:鎸夐獞琛岃褰� member_rides.type 绛涢��(鍙��)
.inSql(Objects.nonNull(model.getBikeType()), Goodsorder::getId,
"select ordre_id from member_rides where isdeleted = 0 and type = " + model.getBikeType())
+ // 绉熺敤涓�(status=1):浠呬繚鐣欏瓨鍦ㄩ獞琛岃褰曠殑璁㈠崟,杩囨护鎺夊凡鏀粯浣嗘棤楠戣璁板綍鐨勬暟鎹�
+ .inSql(queryInProgress, Goodsorder::getId,
+ "select ordre_id from member_rides where isdeleted = 0")
.orderByDesc(Goodsorder::getPayDate);
IPage<OperationOrderVO> result = goodsorderMapper.selectJoinPage(page, OperationOrderVO.class, wrapper);
List<OperationOrderVO> records = result.getRecords();
--
Gitblit v1.9.3