问题修改

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);
             }

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;
+
 
 
 

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;
+
 
 }

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>

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

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">