From 998bc10d74f370f7f99331d9df53d43311949f53 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 14 八月 2025 19:15:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
index 2db46d2..76e01bb 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
@@ -5,9 +5,11 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.TCompany;
import com.stylefeng.guns.modular.system.model.TOrderPrivateCar;
import com.stylefeng.guns.modular.system.dao.TOrderPrivateCarMapper;
import com.stylefeng.guns.modular.system.model.TServerCarmodel;
+import com.stylefeng.guns.modular.system.service.ITCompanyService;
import com.stylefeng.guns.modular.system.service.ITOrderPrivateCarService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.service.ITServerCarmodelService;
@@ -30,6 +32,9 @@
@Autowired
private ITServerCarmodelService serverCarmodelService;
+
+ @Autowired
+ private ITCompanyService companyService;
@@ -56,6 +61,13 @@
}
map.put("serverCarModelName", collect);
}
+
+ if(null != map.get("companyId")){
+ TCompany company = companyService.selectById(map.get("companyId").toString());
+ if(company!=null){
+ map.put("companyName", company.getName());
+ }
+ }
}
return privateCarOrderList;
}
@@ -81,6 +93,13 @@
}
map.put("serverCarModelName", collect);
}
+
+ if(null != map.get("companyId")){
+ TCompany company = companyService.selectById(map.get("companyId").toString());
+ if(company!=null){
+ map.put("companyName", company.getName());
+ }
+ }
}
return privateCarOrderList;
}
@@ -94,4 +113,14 @@
public List<Map<String, Object>> getSurcharge(Object id, Integer orderType) {
return this.baseMapper.getSurcharge(id,orderType);
}
+
+ @Override
+ public List<Map<String, Object>> promotionInfo(Page<Map<String, Object>> page, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId,Integer activityId) {
+ return this.baseMapper.promotionInfo(page, beginTime, endTime, orderNum, userName, name, driverName, roleType, objectId,driverId,activityId);
+ }
+
+ @Override
+ public List<Map<String, Object>> promotionInfoExport(Object o, String beginTime, String endTime, String orderNum, String userName, String name, String driverName, Integer roleType, Integer objectId,Integer driverId,Integer activityId) {
+ return this.baseMapper.promotionInfoExport(beginTime, endTime, orderNum, userName, name, driverName, roleType, objectId,driverId,activityId);
+ }
}
--
Gitblit v1.7.1