[update] 加入司机区域线路字段返回

warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverGoodsLossRecordServiceImpl.java

@@ -74,16 +74,7 @@ public class DriverGoodsLossRecordServiceImpl extends ServiceImpl<DriverGoodsLos
         if (null == vos || vos.isEmpty()) {
             return null;
         }
-
-        Map<Long, AreaStaffResponse> areaStaffResponseMap = areaStaffService.searchAreaStaffMap(vos);
-
-        vos.forEach(v -> {
-            AreaStaffResponse areaStaffResponse = areaStaffResponseMap.get(v.getAreaStaffId());
-            if (null != areaStaffResponse) {
-                v.setAreaStaffName(areaStaffResponse.getEmployeeName());
-            }
-        });
-
+        areaStaffService.buildAreaStaffName(vos);
         operatorBuildService.buildOperatorName(vos);
 
         return vos;

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

@@ -180,15 +180,7 @@ public class DriverIntervalCargoDamageController extends BaseController {
             all.addAll(driverIntervalCargoDamageDetailVos);
             pageBo.setPageNum(pageBo.getPageNum() + 1);
         }
-
-        Map<Long, AreaStaffResponse> areaStaffMap = areaStaffService.searchAreaStaffMap(all);
-        all.forEach(driverIntervalCargoDamageDetailVo -> {
-            AreaStaffResponse areaStaffResponse = areaStaffMap.get(driverIntervalCargoDamageDetailVo.getAreaStaffId());
-            if (null != areaStaffResponse) {
-                driverIntervalCargoDamageDetailVo.setAreaStaffName(areaStaffResponse.getEmployeeName());
-            }
-        });
-
+        areaStaffService.buildAreaStaffName(all);
         List<DriverIntervalCargoDamageDetailExport> driverIntervalCargoDamageDetailExports = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.detailVoListToDetailExportList(all);
         String uri = exportClient.export(driverIntervalCargoDamageDetailExports, "export/driver/interval/cargoDamage", "区间货损记录详情" + System.currentTimeMillis());
         return Result.success(uri);

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/export/DriverGoodsLossRecordExport.java

@@ -28,6 +28,12 @@ public class DriverGoodsLossRecordExport implements Serializable {
     private String operatorChainName;
 
     /**
+     * 区域线路名称
+     */
+    @ExcelProperty("区域线路")
+    private String areaChainName;
+
+    /**
      * 区域员工名称
      */
     @ExcelProperty("区域员工名称")

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/response/DriverGoodsLossRecordResponse.java

@@ -40,6 +40,11 @@ public class DriverGoodsLossRecordResponse implements Serializable {
     private String areaStaffName;
 
     /**
+     * 区域线路名称
+     */
+    private String areaChainName;
+
+    /**
      * 昨日在途数量
      */
     private Long yesterdayOnRouteNum;