Browse Source

[update] 区间货损统计司机盈亏导出对象未转换问题修复

miajio 4 days ago
parent
commit
d5e208900d

+ 3 - 5
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/controller/DriverIntervalCargoDamageController.java

@@ -21,10 +21,7 @@ import com.yr.warehouse.admin.service.areastaff.AreaStaffService;
 import com.yr.warehouse.admin.service.driver.*;
 import com.yr.warehouse.admin.service.operator.OperatorBuildService;
 import com.yr.warehouse.admin.web.common.BaseController;
-import com.yr.warehouse.admin.web.driver.export.DriverIntervalCargoDamageDetailExport;
-import com.yr.warehouse.admin.web.driver.export.DriverIntervalCargoDamageUnReplenishOrderExport;
-import com.yr.warehouse.admin.web.driver.export.DriverRouteAccountRecordDetailExport;
-import com.yr.warehouse.admin.web.driver.export.DriverRouteAccountRecordMainExport;
+import com.yr.warehouse.admin.web.driver.export.*;
 import com.yr.warehouse.admin.web.driver.mapstruct.DriverIntervalCargoDamageMapStruct;
 import com.yr.warehouse.admin.web.driver.request.*;
 import com.yr.warehouse.admin.web.driver.response.*;
@@ -456,7 +453,8 @@ public class DriverIntervalCargoDamageController extends BaseController {
         if (resultVos.isEmpty()) {
             return Result.fail("没有可导出的数据");
         }
-        String uri = exportClient.export(resultVos, "export/driver/interval/goodsLossStatProfit", "区间货损盈亏记录" + System.currentTimeMillis());
+        List<DriverIntervalCargoDamageGoodsLossStatProfitExport> exports = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.driverIntervalCargoDamageGoodsLossStatProfitPageVoToExport(resultVos);
+        String uri = exportClient.export(exports, "export/driver/interval/goodsLossStatProfit", "区间货损盈亏记录" + System.currentTimeMillis());
         return Result.success(uri);
     }
 }

+ 3 - 4
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/mapstruct/DriverIntervalCargoDamageMapStruct.java

@@ -4,10 +4,7 @@ import com.yr.bluecat.common.entity.request.AdminUserRequest;
 import com.yr.warehouse.admin.driver.bo.*;
 import com.yr.warehouse.admin.driver.vo.*;
 import com.yr.warehouse.admin.replenish.menu.ReplenishOrderTypeEnum;
-import com.yr.warehouse.admin.web.driver.export.DriverIntervalCargoDamageDetailExport;
-import com.yr.warehouse.admin.web.driver.export.DriverIntervalCargoDamageUnReplenishOrderExport;
-import com.yr.warehouse.admin.web.driver.export.DriverRouteAccountRecordDetailExport;
-import com.yr.warehouse.admin.web.driver.export.DriverRouteAccountRecordMainExport;
+import com.yr.warehouse.admin.web.driver.export.*;
 import com.yr.warehouse.admin.web.driver.request.*;
 import com.yr.warehouse.admin.web.driver.response.*;
 import com.yr.warehouse.api.driver.request.DriverCargoDamageInventoryRequest;
@@ -94,4 +91,6 @@ public interface DriverIntervalCargoDamageMapStruct {
     List<DriverIntervalCargoDamageGoodsLossStatProfitPageResponse> driverIntervalCargoDamageGoodsLossStatProfitPageVoToResponse(List<DriverIntervalCargoDamageGoodsLossStatProfitPageVo> driverIntervalCargoDamageGoodsLossStatProfitPageVos);
 
     DriverIntervalCargoDamageGoodsLossStatProfitPageBo driverIntervalCargoDamageGoodsLossStatProfitExportRequestToBo(DriverIntervalCargoDamageGoodsLossStatProfitExportRequest request);
+
+    List<DriverIntervalCargoDamageGoodsLossStatProfitExport> driverIntervalCargoDamageGoodsLossStatProfitPageVoToExport(List<DriverIntervalCargoDamageGoodsLossStatProfitPageVo> resultVos);
 }