From cbadfd8e691ab335965202a984db16e55ac8e42c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 17:51:06 +0800
Subject: [PATCH] 诚发五金：按技术方案重构业务功能并补齐库结构
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
index 615441c..eaebcdb 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
@@ -18,9 +18,11 @@
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportExcelVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestDeptStatisticsRespVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDeptStatisticsDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderMapper;
@@ -34,6 +36,7 @@
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -119,10 +122,12 @@
throw exception(PURCHASE_REQUEST_NO_EXISTS);
}
- // 4. 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
- Long userId = Long.parseLong(getCurrentUserId());
+ // 4. 瑙ｆ瀽鐢宠浜� / 鐢宠閮ㄩ棬锛氭湭鎸囧畾鏃跺彇褰撳墠鐧诲綍鐢ㄦ埛鍙婂叾鎵�灞為儴闂�
+ Long userId = createReqVO.getRequestUserId() != null
+ ? createReqVO.getRequestUserId() : Long.parseLong(getCurrentUserId());
AdminUserRespDTO user = adminUserApi.getUser(userId);
- Long deptId = user != null ? user.getDeptId() : null;
+ Long deptId = createReqVO.getRequestDeptId() != null
+ ? createReqVO.getRequestDeptId() : (user != null ? user.getDeptId() : null);
// 5. 鎻掑叆鐢宠鍗�
ErpPurchaseRequestDO purchaseRequest = BeanUtils.toBean(createReqVO, ErpPurchaseRequestDO.class, req -> req
@@ -640,6 +645,24 @@
return purchaseOrder.getId();
}
+ @Override
+ public List<ErpPurchaseRequestDeptStatisticsRespVO> getDeptStatistics(LocalDateTime beginTime, LocalDateTime endTime) {
+ List<ErpPurchaseRequestDeptStatisticsDO> statisticsList = purchaseRequestMapper.selectDeptStatistics(beginTime, endTime);
+ if (CollUtil.isEmpty(statisticsList)) {
+ return Collections.emptyList();
+ }
+ Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(statisticsList, ErpPurchaseRequestDeptStatisticsDO::getDeptId));
+ return BeanUtils.toBean(statisticsList, ErpPurchaseRequestDeptStatisticsRespVO.class, vo -> {
+ if (vo.getDeptId() == null) {
+ vo.setDeptName("鏈寚瀹氶儴闂�");
+ return;
+ }
+ DeptRespDTO dept = deptMap.get(vo.getDeptId());
+ // 閮ㄩ棬宸插垹闄ゆ椂鍥為��涓哄彲璇荤紪鍙凤紝閬垮厤鍑虹幇绌虹櫧鐨勯儴闂ㄥ垪
+ vo.setDeptName(dept != null ? dept.getName() : "閮ㄩ棬(ID=" + vo.getDeptId() + ")");
+ });
+ }
+
/**
* 鏍￠獙閲囪喘鐢宠瀹℃壒鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
*/
--
Gitblit v1.9.3