住建

data-ui/src/api/data/housingconstruction/car.js

@@ -73,7 +73,7 @@ export function getCarList(query) {
 //设备列表
 export function getEquipmentList(query) {
   return request({
-    url: '/sooka-sponest-center-monitor/gps/devices/getGasTankListByDeptId',
+    url: '/sooka-sponest-center-monitor/gps/devices/listAll',
     method: 'get',
     params: query
   })

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionCarMapper.xml

@@ -158,7 +158,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="getCarList" parameterType="CenterdataTHousingconstructionCar" resultType="map">
-        <include refid="selectCenterdataTHousingconstructionCarVo"/>
+        select a.id, a.dept_id deptId, a.dept_name deptName, a.enterprise_id enterpriseId,a.enterprise_name enterpriseName,
+               a.car_number carNumber, a.manager_id managerId, a.manager_name managerName, a.driver_id driverId,
+               a.driver_name driverName, a.escort_id escortId, a.escort_name escortName, a.emergency_equipment emergencyEquipment,
+        a.protection, a.speed from centerdata_t_housingconstruction_car a
         left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
         <where>
             <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>