[update] 司机在途记录返回运营商id、运营商id链、运营商名称、运营商名称链

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/vo/DriverRouteAccountRecordMainVo.java

@@ -1,6 +1,7 @@
 package com.yr.warehouse.admin.driver.vo;
 
 import com.yr.warehouse.admin.areastaff.fase.AreaStaffIdFace;
+import com.yr.warehouse.admin.operator.face.OperatorNameFace;
 import lombok.Data;
 
 import java.io.Serial;
@@ -12,7 +13,7 @@ import java.time.LocalDateTime;
  * 司机在途核算记录vo
  */
 @Data
-public class DriverRouteAccountRecordMainVo implements AreaStaffIdFace, Serializable {
+public class DriverRouteAccountRecordMainVo implements AreaStaffIdFace, OperatorNameFace, Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -23,6 +24,26 @@ public class DriverRouteAccountRecordMainVo implements AreaStaffIdFace, Serializ
     private Long id;
 
     /**
+     * 运营商id
+     */
+    private Long operatorId;
+
+    /**
+     * 运营商id链
+     */
+    private String operatorChain;
+
+    /**
+     * 运营商名称
+     */
+    private String operatorName;
+
+    /**
+     * 运营商名称链
+     */
+    private String operatorChainName;
+
+    /**
      * 区域员工id
      */
     private Long areaStaffId;

warehouse-admin-data/src/main/resources/mapper/driver/DriverOnRouteAccountRecordMainMapper.xml

@@ -63,6 +63,8 @@
     <select id="searchForPage" resultType="com.yr.warehouse.admin.driver.vo.DriverRouteAccountRecordMainVo">
         select
         dorarm.id as id,
+        dorarm.operatorId as operatorId,
+        dorarm.operatorChain as operatorChain,
         dorarm.areaStaffId as areaStaffId,
         dorarm.warehouseId as warehouseId,
         wi.name as warehouseName,

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

@@ -261,6 +261,7 @@ public class DriverIntervalCargoDamageController extends BaseController {
             bo.setPageNum(bo.getPageNum() + 1);
         }
         areaStaffService.buildAreaStaffName(all);
+        operatorBuildService.buildOperatorName(all);
         List<DriverRouteAccountRecordMainExport> driverRouteAccountRecordMainExports = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.routeAccountRecordMainVoListToRouteAccountRecordMainExportList(all);
         driverRouteAccountRecordMainExports.forEach(export -> {
             export.setStatus(DriverOnRouteAccountRecordStatusEnum.getDesc(export.getStatus()));
@@ -288,6 +289,7 @@ public class DriverIntervalCargoDamageController extends BaseController {
             return pageResult.success(0, new ArrayList<>());
         }
         areaStaffService.buildAreaStaffName(driverRouteAccountRecordMainVos);
+        operatorBuildService.buildOperatorName(driverRouteAccountRecordMainVos);
         List<DriverRouteAccountRecordMainResponse> driverRouteAccountRecordMainResponses = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.accountRecordMainVoToResponse(driverRouteAccountRecordMainVos);
         return pageResult.success(page.getTotal(), driverRouteAccountRecordMainResponses);
     }

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

@@ -18,6 +18,12 @@ public class DriverRouteAccountRecordMainExport implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 运营商名称
+     */
+    @ExcelProperty("运营商名称")
+    private String operatorChainName;
+
+    /**
      * 区域线路名称
      */
     @ExcelProperty("区域线路")

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

@@ -23,6 +23,26 @@ public class DriverRouteAccountRecordMainResponse implements Serializable {
     private Long id;
 
     /**
+     * 运营商id
+     */
+    private Long operatorId;
+
+    /**
+     * 运营商id链
+     */
+    private String operatorChain;
+
+    /**
+     * 运营商名称
+     */
+    private String operatorName;
+
+    /**
+     * 运营商名称链
+     */
+    private String operatorChainName;
+
+    /**
      * 区域员工id
      */
     private Long areaStaffId;