Merge branch 'master-background-manager' into dev

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleInformationDownloadBiz.java

@@ -32,7 +32,7 @@ public class VehicleInformationDownloadBiz extends BaseBiz<VehicleMapper, Vehicl
 
 
 
-    public List<VehicleExcelVo> getByPageNotAllData(VehiclePageQueryVo vehiclePageQueryVo, List<Integer> companyList) throws Exception {
+    public List<ResultVehicleVo> getByPageNotAllData(VehiclePageQueryVo vehiclePageQueryVo, List<Integer> companyList) throws Exception {
         Map<String, Object> params = PropertyUtils.describe(vehiclePageQueryVo);
         //处理预定日期相关参数
         vehicleBiz.adjustBookedInfoParam(params, vehiclePageQueryVo);
@@ -42,10 +42,10 @@ public class VehicleInformationDownloadBiz extends BaseBiz<VehicleMapper, Vehicl
             params.put("companyList", Arrays.asList(-1));
         }
 
-        return  mapper.getVehicleExcelVoNotAllData(params);
+        return  mapper.getByPageNotAllData(params);
     }
 
-    public List<VehicleExcelVo> getByPage(VehiclePageQueryVo vehiclePageQueryVo) throws Exception  {
+    public List<ResultVehicleVo> getByPage(VehiclePageQueryVo vehiclePageQueryVo) throws Exception  {
 
         Map<String, Object> params = PropertyUtils.describe(vehiclePageQueryVo);
         //处理预定日期相关参数
@@ -54,10 +54,10 @@ public class VehicleInformationDownloadBiz extends BaseBiz<VehicleMapper, Vehicl
         if (vehiclePageQueryVo.getModelId() == null) {
             params.remove("modelId");
         }
-        return  mapper.getVehicleExcelVo(params);
+        return  mapper.getByPage(params);
     }
 
-    public List<VehicleExcelVo> getList(String vehiclePageQueryVoJson, UserDTO userDTO) {
+    public List<ResultVehicleVo> getResultVehicleVoList(String vehiclePageQueryVoJson, UserDTO userDTO) {
         VehiclePageQueryVo vehiclePageQueryVo = new VehiclePageQueryVo();
         try {
             if (StringUtils.isNotBlank(vehiclePageQueryVoJson)){
@@ -75,4 +75,17 @@ public class VehicleInformationDownloadBiz extends BaseBiz<VehicleMapper, Vehicl
         }
         return new ArrayList();
     }
+
+
+    public List<VehicleExcelVo> getList(String vehiclePageQueryVoJson, UserDTO userDTO) throws Exception  {
+        List<ResultVehicleVo> resultVehicleVoList = getResultVehicleVoList(vehiclePageQueryVoJson, userDTO);
+        ArrayList<VehicleExcelVo> arrayList = Lists.newArrayList();
+        for (ResultVehicleVo resultVehicleVo : resultVehicleVoList) {
+            VehicleExcelVo vehicleExcelVo = new VehicleExcelVo();
+            BeanUtilsBean.getInstance().copyProperties(vehicleExcelVo,resultVehicleVo);
+            arrayList.add(vehicleExcelVo);
+        }
+        return arrayList;
+
+    }
 }