From 44ceeeee9cd3f76b0f3a2135421407b73dea9bb0 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 28 八月 2026 11:41:58 +0800
Subject: [PATCH] fix(sales): 修复销售台账发货状态查询逻辑
---
src/main/java/com/ruoyi/device/mapper/DeviceLedgerMapper.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/mapper/DeviceLedgerMapper.java b/src/main/java/com/ruoyi/device/mapper/DeviceLedgerMapper.java
index 17683d4..48a8e0c 100644
--- a/src/main/java/com/ruoyi/device/mapper/DeviceLedgerMapper.java
+++ b/src/main/java/com/ruoyi/device/mapper/DeviceLedgerMapper.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.bean.dto.DeviceTypeDetail;
+import com.ruoyi.account.bean.dto.DeviceTypeDistributionVO;
import com.ruoyi.device.dto.DeviceLedgerDto;
import com.ruoyi.device.execl.DeviceLedgerExeclDto;
import com.ruoyi.device.pojo.DeviceLedger;
@@ -17,8 +19,21 @@
IPage<DeviceLedgerDto> queryPage(Page page, @Param("deviceLedger") DeviceLedgerDto deviceLedgerDto);
+ /**
+ * 璁惧閫夋嫨鍒楄〃锛堝贰妫�绛夋ā鍧楅�夎澶囩敤锛夛紝鏀寔鎸夊尯鍩熼�掑綊绛涢��
+ * @param areaId 鍖哄煙ID锛屽彲涓虹┖琛ㄧず鍏ㄩ儴
+ */
+ List<DeviceLedgerDto> selectDeviceOptions(@Param("areaId") Long areaId);
+
List<DeviceLedgerExeclDto> deviceLedgerExportList(DeviceLedger deviceLedger);
@InterceptorIgnore(tenantLine = "true")
DeviceLedger selectById1(Long id);
+
+ /**
+ * 鎸夊勾浠界粺璁¤澶囩被鍨嬪垎甯�
+ * @param year 浼犲叆鐨勫勾浠斤紙濡�2026锛�
+ * @return 鍚勭被鍨嬬殑鏁伴噺鍜岄噾棰�
+ */
+ List<DeviceTypeDetail> getDeviceTypeDistributionByYear(@Param("year") Integer year);
}
--
Gitblit v1.9.3