From fea3d6cbb624a3c9df6e1ae344a10b71110be439 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 26 九月 2025 15:37:03 +0800
Subject: [PATCH] Merge branch 'pim_ywx'
---
src/main/java/com/ruoyi/warehouse/mapper/DocumentationMapper.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/mapper/DocumentationMapper.java b/src/main/java/com/ruoyi/warehouse/mapper/DocumentationMapper.java
index c87d9f0..33278bf 100644
--- a/src/main/java/com/ruoyi/warehouse/mapper/DocumentationMapper.java
+++ b/src/main/java/com/ruoyi/warehouse/mapper/DocumentationMapper.java
@@ -3,12 +3,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto;
+import com.ruoyi.warehouse.dto.DocumentationDto;
import com.ruoyi.warehouse.pojo.Documentation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
* @author 86151
@@ -19,9 +22,25 @@
@Mapper
public interface DocumentationMapper extends BaseMapper<Documentation> {
- IPage<Documentation> listPage(Page page,@Param("documentation") Documentation documentation);
+ IPage<DocumentationDto> listPage(Page page, @Param("documentation") Documentation documentation);
+ List<DocumentationDto> list();
+ List<DocumentationDto> listByDocumentClassificationId(@Param("documentClassificationId") Long documentClassificationId);
+ List<DocumentationDto> listBywarehouseGoodsShelvesRowcolId(@Param("warehouseGoodsShelvesRowcolId") Long warehouseGoodsShelvesRowcolId);
+ @Select("select count(*) from documentation")
+ Integer countTotalDocs();
+ @Select("select count(distinct document_classification_id) from documentation")
+ Integer countCategoryNum();
+ @Select("select count(*) from documentation where doc_status = '鍊熷嚭'")
+ Integer countBorrowedDocs();
+ @Select("select count(*) from documentation where create_time >= date_format(now(), '%Y-%m-01') and create_time < date_format(now(), '%Y-%m-%d')")
+ Integer countMonthlyAddedDocs();
- List<Documentation> list();
+ @Select("select dc.category, count(*) as count from documentation doc left join document_classification dc on doc.document_classification_id = dc.id group by dc.category")
+ List<Map<String, Object>> countCategoryDistribution();
+
+ @Select("select doc_status as docStatus, count(*) as count from documentation group by doc_status")
+ List<Map<String, Object>> countStatusDistribution();
+
}
--
Gitblit v1.9.3