From f7df68bdd651a4d40265e2df07212a2116eff563 Mon Sep 17 00:00:00 2001
From: weicw <594098497@qq.com>
Date: Fri, 6 Nov 2026 08:10:37 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=87=AD=E8=AF=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=85=B3=E8=81=94=E8=BF=90=E5=8D=95=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81=E9=A1=B9=E7=9B=AE=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=B9=B6=E8=BF=94=E5=9B=9E=E9=A1=B9=E7=9B=AE=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- waybill-batches 接口新增 projectId 筛选项
- 分页结果增加 projectName，同一批次跨多个项目时返回「多个项目」
---
 .../transport/controller/VoucherManageController.java      | 7 ++++---
 .../transport/mapper/VoucherWaybillBatchMapper.java        | 5 +++--
 .../transport/mapper/VoucherWaybillBatchMapper.xml         | 2 ++
 .../transport/service/IVoucherManageService.java           | 2 +-
 .../transport/service/impl/VoucherManageServiceImpl.java   | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/VoucherManageController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/VoucherManageController.java
index 69f53eb0..abcee864 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/VoucherManageController.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/VoucherManageController.java
@@ -135,9 +135,10 @@ public class VoucherManageController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@Operation(summary = "可关联运输批次")
 	public R<IPage<Map<String, Object>>> waybillBatches(Query query, @RequestParam(required = false) String batchNo,
-		@RequestParam(required = false) String createUser, @RequestParam(required = false) Integer waybillCount,
-		@RequestParam(required = false) String createTimeStart, @RequestParam(required = false) String createTimeEnd) {
-		return R.data(voucherManageService.selectableWaybillBatches(Condition.getPage(query), batchNo, createUser, waybillCount, createTimeStart, createTimeEnd));
+		@RequestParam(required = false) Long projectId, @RequestParam(required = false) String createUser,
+		@RequestParam(required = false) Integer waybillCount, @RequestParam(required = false) String createTimeStart,
+		@RequestParam(required = false) String createTimeEnd) {
+		return R.data(voucherManageService.selectableWaybillBatches(Condition.getPage(query), batchNo, projectId, createUser, waybillCount, createTimeStart, createTimeEnd));
 	}
 
 	@PostMapping("/audit-pass")
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/VoucherWaybillBatchMapper.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/VoucherWaybillBatchMapper.java
index 86e7a57e..7c30968e 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/VoucherWaybillBatchMapper.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/VoucherWaybillBatchMapper.java
@@ -13,8 +13,9 @@ import org.apache.ibatis.annotations.Delete;
 public interface VoucherWaybillBatchMapper extends BaseMapper<VoucherWaybillBatch> {
 	@Delete("DELETE FROM blade_voucher_waybill_batch WHERE voucher_id = #{voucherId}")
 	int deletePhysicalByVoucherId(@Param("voucherId") Long voucherId);
-	IPage<Map<String, Object>> selectVoucherWaybillBatchPage(IPage<?> page, @Param("tenantId") String tenantId, @Param("batchNo") String batchNo, @Param("createUser") String createUser,
-		@Param("waybillCount") Integer waybillCount, @Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd,
+	IPage<Map<String, Object>> selectVoucherWaybillBatchPage(IPage<?> page, @Param("tenantId") String tenantId, @Param("batchNo") String batchNo,
+		@Param("projectId") Long projectId, @Param("createUser") String createUser, @Param("waybillCount") Integer waybillCount,
+		@Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd,
 		@Param("restrictCarrier") boolean restrictCarrier, @Param("carrierName") String carrierName);
 	List<Map<String, Object>> selectWaybillBatchesByIds(@Param("tenantId") String tenantId, @Param("ids") List<Long> ids,
 		@Param("restrictCarrier") boolean restrictCarrier, @Param("carrierName") String carrierName);
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/VoucherWaybillBatchMapper.xml b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/VoucherWaybillBatchMapper.xml
index 2eadd452..4b599bb5 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/VoucherWaybillBatchMapper.xml
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/mapper/VoucherWaybillBatchMapper.xml
@@ -4,12 +4,14 @@
   <select id="selectVoucherWaybillBatchPage" resultType="java.util.LinkedHashMap">
     SELECT MIN(w.id) AS id, MAX(w.create_time) AS createTime, MAX(w.create_user) AS createUser,
       MAX(u.real_name) AS createUserName, COUNT(*) AS waybillCount,
+      CASE WHEN COUNT(DISTINCT COALESCE(w.project_id, -1)) > 1 THEN '多个项目' ELSE MAX(w.project_name) END AS projectName,
       COALESCE(NULLIF(w.batch_no, ''), '未分批运单') AS batchNo
     FROM blade_waybill w
     LEFT JOIN blade_user u ON u.id = w.create_user
     WHERE w.is_deleted = 0 AND w.tenant_id = #{tenantId}
     <if test="restrictCarrier">AND w.carrier_name = #{carrierName}</if>
     <if test="batchNo != null and batchNo != ''">AND w.batch_no LIKE CONCAT('%', #{batchNo}, '%')</if>
+    <if test="projectId != null">AND w.project_id = #{projectId}</if>
     <if test="createUser != null and createUser != ''">AND w.create_user = #{createUser}</if>
     <if test="createTimeStart != null and createTimeStart != ''">AND w.create_time <![CDATA[>=]]> #{createTimeStart}</if>
     <if test="createTimeEnd != null and createTimeEnd != ''">AND w.create_time <![CDATA[<=]]> #{createTimeEnd}</if>
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IVoucherManageService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IVoucherManageService.java
index b8a16346..e3a44df4 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IVoucherManageService.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IVoucherManageService.java
@@ -30,7 +30,7 @@ public interface IVoucherManageService extends BaseService<VoucherManage> {
 	void processUploadedVoucher(Long voucherId);
 	void reprocessUploadedVoucher(Long voucherId);
 	void removeVoucher(Long id);
-	IPage<Map<String, Object>> selectableWaybillBatches(IPage<?> page, String batchNo, String createUser, Integer waybillCount, String createTimeStart, String createTimeEnd);
+	IPage<Map<String, Object>> selectableWaybillBatches(IPage<?> page, String batchNo, Long projectId, String createUser, Integer waybillCount, String createTimeStart, String createTimeEnd);
 	void auditPass(Long id);
 	void auditReject(Long id, String rejectReason);
 }
diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/VoucherManageServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/VoucherManageServiceImpl.java
index 3553602e..c3baf36c 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/VoucherManageServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/VoucherManageServiceImpl.java
@@ -1331,8 +1331,8 @@ public class VoucherManageServiceImpl extends BaseServiceImpl<VoucherManageMappe
 	}
 
 	@Override
-	public IPage<Map<String, Object>> selectableWaybillBatches(IPage<?> page, String batchNo, String createUser, Integer waybillCount, String createTimeStart, String createTimeEnd) {
-		return voucherWaybillBatchMapper.selectVoucherWaybillBatchPage(page, AuthUtil.getTenantId(), batchNo, createUser, waybillCount, createTimeStart, createTimeEnd,
+	public IPage<Map<String, Object>> selectableWaybillBatches(IPage<?> page, String batchNo, Long projectId, String createUser, Integer waybillCount, String createTimeStart, String createTimeEnd) {
+		return voucherWaybillBatchMapper.selectVoucherWaybillBatchPage(page, AuthUtil.getTenantId(), batchNo, projectId, createUser, waybillCount, createTimeStart, createTimeEnd,
 			!TransportBusinessSupport.isAdministrator(), currentCarrierName());
 	}