[update] 在途明细新增基于司机id及统计日期直接查询

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverGoodsLossRecordMapper.java

@@ -53,4 +53,12 @@ public interface DriverGoodsLossRecordMapper extends BaseMapper<DriverGoodsLossR
      * @param statDate 统计日期
      */
     void deleteOld(@Param("statDate") LocalDate statDate);
+
+    /**
+     * 根据区域员工id和统计日期查询
+     * @param areaStaffId 区域员工id
+     * @param statDate 统计日期
+     * @return 司机货损记录
+     */
+    DriverGoodsLossRecord selectByAreaStaffIdAdStatDate(@Param("areaStaffId") Long areaStaffId, @Param("statDate") LocalDate statDate);
 }

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

@@ -101,5 +101,10 @@
         </foreach>
         order by id desc
     </select>
+    <select id="selectByAreaStaffIdAdStatDate"
+            resultType="com.yr.warehouse.admin.driver.data.DriverGoodsLossRecord">
+        select <include refid="Base_Column_List" /> from yr_driver_goods_loss_record
+        where areaStaffId = #{areaStaffId} and statDate = #{statDate}
+    </select>
 
 </mapper>

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

@@ -7,6 +7,7 @@ import com.yr.warehouse.admin.driver.data.DriverGoodsLossRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yr.warehouse.admin.driver.vo.DriverGoodsLossRecordVo;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -39,4 +40,12 @@ public interface DriverGoodsLossRecordService extends IService<DriverGoodsLossRe
      * @return
      */
     List<DriverGoodsLossRecordVo> writeOperatorData(List<DriverGoodsLossRecordVo> vos);
+
+    /**
+     * 根据区域员工id和统计日期查询货损记录
+     * @param areaStaffId 区域员工id
+     * @param statDate 统计日期
+     * @return
+     */
+    DriverGoodsLossRecord selectByAreaStaffIdAdStatDate(Long areaStaffId, LocalDate statDate);
 }

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

@@ -18,6 +18,7 @@ import com.yr.warehouse.admin.service.operator.OperatorBuildService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -80,5 +81,10 @@ public class DriverGoodsLossRecordServiceImpl extends ServiceImpl<DriverGoodsLos
         return vos;
     }
 
+    @Override
+    public DriverGoodsLossRecord selectByAreaStaffIdAdStatDate(Long areaStaffId, LocalDate statDate) {
+        return baseMapper.selectByAreaStaffIdAdStatDate(areaStaffId, statDate);
+    }
+
 
 }

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

@@ -6,13 +6,16 @@ import com.yr.bluecat.common.entity.response.Result;
 import com.yr.bluecat.common.utils.excel.ExportClient;
 import com.yr.prism.auth.core.user.AdminUserInfo;
 import com.yr.warehouse.admin.driver.bo.DriverRouteDetailPageBo;
+import com.yr.warehouse.admin.driver.data.DriverGoodsLossRecord;
 import com.yr.warehouse.admin.driver.vo.DriverRouteDetailVo;
+import com.yr.warehouse.admin.service.driver.DriverGoodsLossRecordService;
 import com.yr.warehouse.admin.service.driver.DriverOnRouteDetailLogService;
 import com.yr.warehouse.admin.web.common.BaseController;
 import com.yr.warehouse.admin.web.driver.export.DriverRouteDetailExport;
 import com.yr.warehouse.admin.web.driver.mapstruct.DriverRouteDetailMapStruct;
 import com.yr.warehouse.admin.web.driver.request.DriverRouteDetailExportRequest;
 import com.yr.warehouse.admin.web.driver.request.DriverRouteDetailPageRequest;
+import com.yr.warehouse.admin.web.driver.request.DriverRouteDetailPageToDriverRequest;
 import com.yr.warehouse.admin.web.driver.response.DriverRouteDetailResponse;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -30,6 +33,8 @@ public class DriverRouteDetailController extends BaseController {
 
     @Resource
     private DriverOnRouteDetailLogService driverOnRouteDetailLogService;
+    @Resource
+    private DriverGoodsLossRecordService driverGoodsLossRecordService;
 
     @Resource
     private ExportClient exportClient;
@@ -54,6 +59,27 @@ public class DriverRouteDetailController extends BaseController {
     }
 
     /**
+     * 基于司机id及统计时间查询司机在途明细
+     * @param request
+     * @param adminUserInfo
+     * @return
+     */
+    @PostMapping("/pageToDriver")
+    @ResponseBody
+    public PageResult<DriverRouteDetailResponse> pageToDriver(@Validated @RequestBody DriverRouteDetailPageToDriverRequest request, AdminUserInfo adminUserInfo) {
+        DriverGoodsLossRecord driverGoodsLossRecord = driverGoodsLossRecordService.selectByAreaStaffIdAdStatDate(request.getAreaStaffId(), request.getStatDate());
+
+        DriverRouteDetailPageRequest req = new DriverRouteDetailPageRequest();
+        req.setGoodsLossRecordId(driverGoodsLossRecord.getId());
+        req.setGoodsName(request.getGoodsName());
+        req.setPageNum(request.getPageNum());
+        req.setPageSize(request.getPageSize());
+        req.setAppId(request.getAppId());
+        req.setAppSecret(request.getAppSecret());
+        return page(req, adminUserInfo);
+    }
+
+    /**
      * 导出司机在途明细
      * @return
      */

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverRouteDetailPageToDriverRequest.java

@@ -0,0 +1,39 @@
+package com.yr.warehouse.admin.web.driver.request;
+
+import com.yr.bluecat.common.entity.request.PageRequest;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 司机在途明细分页查询参数
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DriverRouteDetailPageToDriverRequest extends PageRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 区域员工id
+     */
+    @NotNull(message = "区域员工id不能为空")
+    private Long areaStaffId;
+
+    /**
+     * 统计日期
+     */
+    @NotNull(message = "统计日期不能为空")
+    private LocalDate statDate;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+}