From cbc307682c0ca48d59e7b539d6a2ae58d49cabe1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 20 八月 2025 22:33:02 +0800
Subject: [PATCH] refactor(driver): 重构司机端收入查询逻辑
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
index 898059e..06b0f52 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
@@ -79,7 +79,9 @@
case when cc.isCross = 1 then '跨城出行,' else '' end,
case when cc.isCrossLogistics = 1 then '跨城小件物流,' else '' end,
case when cc.isSameLogistics = 1 then '同城小件物流,' else '' end,
- case when cc.isCharter = 1 then '包车,' else '' end) as serverStr,
+ case when cc.isCharter = 1 then '包车,' else '' end,
+ case when cc.isHitchRide = 1 then '顺风车,' else '' end,
+ case when cc.isSubstituteDriving = 1 then '代驾,' else '' end) as serverStr,
cc.* FROM t_company as cc
LEFT JOIN (SELECT * FROM sys_user where roleType = 2) as ui on ui.objectId = cc.id
LEFT JOIN (SELECT COUNT(id) as num,superiorId FROM t_company where type = 3 and flag != 3 GROUP BY superiorId) as ci on ci.superiorId = cc.id
@@ -138,7 +140,9 @@
case when cc.isCross = 1 then '跨城出行,' else '' end,
case when cc.isCrossLogistics = 1 then '跨城小件物流,' else '' end,
case when cc.isSameLogistics = 1 then '同城小件物流,' else '' end,
- case when cc.isCharter = 1 then '包车,' else '' end) as serverStr,
+ case when cc.isCharter = 1 then '包车,' else '' end,
+ case when cc.isHitchRide = 1 then '顺风车,' else '' end,
+ case when cc.isSubstituteDriving = 1 then '代驾,' else '' end) as serverStr,
cc.* FROM t_company as cc
LEFT JOIN (SELECT * FROM sys_user where roleType = 3) as ui on ui.objectId = cc.id
LEFT JOIN (select * from t_company where type = 2 and flag != 3) as ci on ci.id = cc.superiorId
--
Gitblit v1.7.1