From a0d55bcc8bfebd408d16166b27b7e05b3e4c9f4a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:50 +0800
Subject: [PATCH] feat(erp): 采购/销售明细按含税单价口径拆税，供应商合同补供应商名称与附件

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java |   76 ++++++++++++++++++++++++--------------
 1 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
index d44d171..872ca40 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
@@ -2,45 +2,65 @@
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
 import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDeptStatisticsDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * ERP 閲囪喘鐢宠 Mapper
- *
- * @author 鑺嬮亾婧愮爜
  */
 @Mapper
 public interface ErpPurchaseRequestMapper extends BaseMapperX<ErpPurchaseRequestDO> {
-
-    default PageResult<ErpPurchaseRequestDO> selectPage(ErpPurchaseRequestPageReqVO reqVO) {
-        MPJLambdaWrapperX<ErpPurchaseRequestDO> query = new MPJLambdaWrapperX<ErpPurchaseRequestDO>()
-                .likeIfPresent(ErpPurchaseRequestDO::getNo, reqVO.getNo())
-                .eqIfPresent(ErpPurchaseRequestDO::getRequestUserId, reqVO.getRequestUserId())
-                .eqIfPresent(ErpPurchaseRequestDO::getRequestDeptId, reqVO.getRequestDeptId())
-                .betweenIfPresent(ErpPurchaseRequestDO::getRequestTime, reqVO.getRequestTime())
-                .eqIfPresent(ErpPurchaseRequestDO::getStatus, reqVO.getStatus())
-                .likeIfPresent(ErpPurchaseRequestDO::getRequestReason, reqVO.getRequestReason())
-                .orderByDesc(ErpPurchaseRequestDO::getId);
-        if (reqVO.getProductId() != null) {
-            query.leftJoin(ErpPurchaseRequestItemDO.class, ErpPurchaseRequestItemDO::getRequestId, ErpPurchaseRequestDO::getId)
-                    .eq(ErpPurchaseRequestItemDO::getProductId, reqVO.getProductId())
-                    .groupBy(ErpPurchaseRequestDO::getId);
-        }
-        return selectJoinPage(reqVO, ErpPurchaseRequestDO.class, query);
-    }
-
-    default int updateByIdAndStatus(Long id, Integer status, ErpPurchaseRequestDO updateObj) {
-        return update(updateObj, new LambdaUpdateWrapper<ErpPurchaseRequestDO>()
-                .eq(ErpPurchaseRequestDO::getId, id).eq(ErpPurchaseRequestDO::getStatus, status));
-    }
 
     default ErpPurchaseRequestDO selectByNo(String no) {
         return selectOne(ErpPurchaseRequestDO::getNo, no);
     }
 
-}
+    default List<ErpPurchaseRequestDO> selectRequestListByIds(Collection<Long> ids) {
+        return selectList(ErpPurchaseRequestDO::getId, ids);
+    }
+
+    default List<ErpPurchaseRequestDO> selectList(Long supplierId, Integer status) {
+        return selectList(new LambdaQueryWrapperX<ErpPurchaseRequestDO>()
+                .eqIfPresent(ErpPurchaseRequestDO::getSupplierId, supplierId)
+                .eqIfPresent(ErpPurchaseRequestDO::getStatus, status));
+    }
+
+    default PageResult<ErpPurchaseRequestDO> selectPage(ErpPurchaseRequestPageReqVO pageReqVO) {
+        return selectPage(pageReqVO, new LambdaQueryWrapperX<ErpPurchaseRequestDO>()
+                .likeIfPresent(ErpPurchaseRequestDO::getNo, pageReqVO.getNo())
+                .eqIfPresent(ErpPurchaseRequestDO::getRequestUserId, pageReqVO.getRequestUserId())
+                .eqIfPresent(ErpPurchaseRequestDO::getRequestDeptId, pageReqVO.getRequestDeptId())
+                .eqIfPresent(ErpPurchaseRequestDO::getSupplierId, pageReqVO.getSupplierId())
+                .eqIfPresent(ErpPurchaseRequestDO::getStatus, pageReqVO.getStatus())
+                .eqIfPresent(ErpPurchaseRequestDO::getInStatus, pageReqVO.getInStatus())
+                .eqIfPresent(ErpPurchaseRequestDO::getPurchaseCategory, pageReqVO.getPurchaseCategory())
+                .betweenIfPresent(ErpPurchaseRequestDO::getRequestTime, pageReqVO.getRequestTime())
+                .orderByDesc(ErpPurchaseRequestDO::getId));
+    }
+
+    /**
+     * 鎸夌敵璇烽儴闂ㄧ粺璁￠噰璐敵璇凤紙鐢宠鍗曟暟銆佸鏍搁�氳繃鍗曟暟銆佹暟閲忎笌閲戦鍚堣锛�
+     */
+    @Select("<script>"
+            + "SELECT request_dept_id AS deptId, COUNT(1) AS requestCount, "
+            + "IFNULL(SUM(CASE WHEN status = 20 THEN 1 ELSE 0 END), 0) AS approvedCount, "
+            + "IFNULL(SUM(total_count), 0) AS totalCount, "
+            + "IFNULL(SUM(total_price), 0) AS totalPrice "
+            + "FROM erp_purchase_request WHERE deleted = 0 "
+            + "<if test='beginTime != null'>AND request_time &gt;= #{beginTime} </if>"
+            + "<if test='endTime != null'>AND request_time &lt;= #{endTime} </if>"
+            + "GROUP BY request_dept_id ORDER BY totalPrice DESC"
+            + "</script>")
+    List<ErpPurchaseRequestDeptStatisticsDO> selectDeptStatistics(@Param("beginTime") LocalDateTime beginTime,
+                                                                  @Param("endTime") LocalDateTime endTime);
+
+}
\ No newline at end of file

--
Gitblit v1.9.3