From 014c9f3973d8bb731f9d2888928ece827b8b7e79 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 20 Jan 2025 16:33:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backstage/controller/CarContractController.java       | 1 +
 .../gzcar/business/backstage/entity/CarContractSupVo.java | 4 ++++
 .../gzcar/business/backstage/entity/DispatchCarVo.java    | 3 +++
 .../mappers/business/backstage/CarTypeMapper.xml          | 8 ++++----
 .../mappers/business/backstage/DispatchCarMapper.xml      | 2 +-
 .../mappers/business/backstage/HomeIndexMapper.xml        | 8 ++++----
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarContractController.java b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarContractController.java
index e11eaec..99ca97e 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/controller/CarContractController.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/controller/CarContractController.java
@@ -229,6 +229,7 @@ public class CarContractController {
                     }
                     exportVo.setXh(num[0]);
                     num[0]++;
+                    exportVos.add(exportVo);
                 });
                 ExportExcelUtil.export(response,"吊车租金信息",CarContractSupCarExportVo.class,exportVos);
             }
diff --git a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarContractSupVo.java b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarContractSupVo.java
index b8e8d75..fe3df68 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarContractSupVo.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarContractSupVo.java
@@ -45,6 +45,10 @@ public class CarContractSupVo {
      */
     private String delCarId;
 
+    private String name;
+
+    private String model;
+
 
 
 
diff --git a/src/main/java/com/bonus/gzcar/business/backstage/entity/DispatchCarVo.java b/src/main/java/com/bonus/gzcar/business/backstage/entity/DispatchCarVo.java
index 2252ca6..d665930 100644
--- a/src/main/java/com/bonus/gzcar/business/backstage/entity/DispatchCarVo.java
+++ b/src/main/java/com/bonus/gzcar/business/backstage/entity/DispatchCarVo.java
@@ -68,5 +68,8 @@ public class DispatchCarVo  extends ParentVo {
     @Excel(name = "待派车数量", width = 10.0, orderNum = "7")
     private int noDispatchNum;
 
+    /**分公司*/
+    private String bmname;
+
 
 }
diff --git a/src/main/resources/mappers/business/backstage/CarTypeMapper.xml b/src/main/resources/mappers/business/backstage/CarTypeMapper.xml
index 0662aa0..3924029 100644
--- a/src/main/resources/mappers/business/backstage/CarTypeMapper.xml
+++ b/src/main/resources/mappers/business/backstage/CarTypeMapper.xml
@@ -90,16 +90,16 @@
                 and  cmt2.id=#{id}
             </if>
             <if test="model!=null and model!=''">
-                and cmt.`name`  like concat('%',#{model}},'%')
+                and cmt.`name`  like concat('%',#{model},'%')
             </if>
             <if test="name!=null and name!=''">
-                and  cmt1.name like concat('%',#{name}},'%')
+                and  cmt1.name like concat('%',#{name},'%')
             </if>
             <if test="unit!=null and unit!=''">
-                and  cmt.unit_name like concat('%',#{unit}},'%')
+                and  cmt.unit_name like concat('%',#{unit},'%')
             </if>
             <if test="type!=null and type!=''">
-                and  cmt2.name like concat('%',#{type}},'%')
+                and  cmt2.name like concat('%',#{type},'%')
             </if>
           and  cmt.is_active=1
     </select>
diff --git a/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml
index 268e035..68d4386 100644
--- a/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml
+++ b/src/main/resources/mappers/business/backstage/DispatchCarMapper.xml
@@ -24,7 +24,7 @@
         select cpa.pro_id proId,pro.`name` proName ,count(1) planNum ,
                sum(cpa.need_num) needNum,sum(cpa.dispatch_num) dispatchNum,sum(cpa.need_num)-sum(cpa.dispatch_num) noDispatchNum,
                if(sum(cpa.need_num)=sum(cpa.dispatch_num),'全部派车',if(sum(cpa.dispatch_num)>0,'部分派车','待派车')) planStatus,
-               ROUND(sum(cpa.dispatch_num)/sum(cpa.need_num)*100,0) process
+               ROUND(sum(cpa.dispatch_num)/sum(cpa.need_num)*100,0) process,pro.bmname AS bmname
         from car_plan_apply cpa
          left join bm_project pro on  cpa.pro_id=pro.bid_id
             where  cpa.status_type=1
diff --git a/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml b/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml
index 8f1571e..9b9c4d0 100644
--- a/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml
+++ b/src/main/resources/mappers/business/backstage/HomeIndexMapper.xml
@@ -101,10 +101,10 @@
     </select>
     <!--首页-二级页面-分公司数据-->
     <select id="getCompanyData" resultType="java.util.Map">
-        SELECT bc.ID AS `id`,
-               bc.NAME AS `name`
-        FROM bm_company bc
-        WHERE IS_ACTIVE = '1'
+        SELECT bp.bmname AS `id`,
+               bp.bmname AS `name`
+        FROM bm_project bp
+        WHERE is_active = '1'
     </select>
     <!--首页-二级页面-工程详情-->
     <select id="getProDetails" resultType="com.bonus.gzcar.business.backstage.entity.HomeProDetailVo">