From 6657d65777a1be6b97b745fe0c2be55a8b3ec11e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期六, 17 一月 2026 13:51:11 +0800
Subject: [PATCH] yys 财务报表,会计报表对接,设备增加字段

---
 src/main/java/com/ruoyi/device/mapper/DeviceLedgerMapper.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/mapper/DeviceLedgerMapper.java b/src/main/java/com/ruoyi/device/mapper/DeviceLedgerMapper.java
index 1a9ed7c..a7d1a37 100644
--- a/src/main/java/com/ruoyi/device/mapper/DeviceLedgerMapper.java
+++ b/src/main/java/com/ruoyi/device/mapper/DeviceLedgerMapper.java
@@ -1,18 +1,33 @@
 package com.ruoyi.device.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 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.device.dto.DeviceLedgerExeclDto;
+import com.ruoyi.account.dto.DeviceTypeDetail;
+import com.ruoyi.account.dto.DeviceTypeDistributionVO;
+import com.ruoyi.device.dto.DeviceLedgerDto;
+import com.ruoyi.device.execl.DeviceLedgerExeclDto;
 import com.ruoyi.device.pojo.DeviceLedger;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 @Mapper
 public interface DeviceLedgerMapper extends BaseMapper<DeviceLedger> {
 
-    IPage<DeviceLedger> queryPage(Page page, DeviceLedger deviceLedger);
+    IPage<DeviceLedgerDto> queryPage(Page page, @Param("deviceLedger") DeviceLedgerDto deviceLedgerDto);
 
     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