From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
index 6efaa98..933185d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
@@ -296,9 +296,9 @@
group by DATE_FORMAT(travelTime, '%Y-%m-%d')
union all
- select DATE_FORMAT(insertTime, '%Y-%m-%d'), 0, 0, 0, 0, count(id), 0, sum(money), 0 from t_order_cancel where orderType = 1
+ select DATE_FORMAT(insertTime, '%Y-%m-%d'), 0, 0, 0, 0, count(id), 0, sum(money), 0 from t_income where orderType = 1 and userType = 1 and type = 3
<if test="null != companyId">
- and orderId in (select id from t_order_private_car where isDelete = 1 and companyId = #{companyId} and state = 10)
+ and incomeId = #{companyId}
</if>
<if test="null != start and '' != start and null != end and '' != end">
and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{start} and #{end}
@@ -339,9 +339,9 @@
</if>
group by DATE_FORMAT(travelTime, '%Y-%m-%d')
union all
- select DATE_FORMAT(insertTime, '%Y-%m-%d'), 0, 0, 0, 0, count(id), 0, sum(money), 0 from t_order_cancel where orderType = 4
+ select DATE_FORMAT(insertTime, '%Y-%m-%d'), 0, 0, 0, 0, count(id), 0, sum(money), 0 from t_income where orderType = 4 and userType = 1 and type = 3
<if test="null != companyId">
- and orderId in (select id from t_order_logistics where isDelete = 1 and companyId = #{companyId} and state = 10)
+ and objectId = #{companyId}
</if>
<if test="null != start and '' != start and null != end and '' != end">
and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{start} and #{end}
--
Gitblit v1.7.1