From c81008c462d2dff5689a942cfb9adaf58b257c56 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 21 一月 2026 10:07:50 +0800
Subject: [PATCH] 浪潮对接单点登录:质量检测管理系统

---
 src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java |   53 ++---------------------------------------------------
 1 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index d7b178f..5b9cbdf 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -33,13 +33,11 @@
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -277,53 +275,6 @@
             dto.setInboundNum0(dto.getInboundNum().subtract(totalInboundNum));
         }
         ExcelUtil<ProcurementPageDtoCopy> util = new ExcelUtil<ProcurementPageDtoCopy>(ProcurementPageDtoCopy.class);
-        util.exportExcel(response, list, "搴撳瓨绠$悊");
-    }
-
-    @Override
-    public void exportCopyTwo(HttpServletResponse response,Integer type) {
-        LambdaQueryWrapper<CustomStorage> customStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        customStorageLambdaQueryWrapper.groupBy(CustomStorage::getSupplierName, CustomStorage::getProductCategory, CustomStorage::getSpecificationModel);
-        List<CustomStorage> list = customStorageMapper.selectList(customStorageLambdaQueryWrapper);
-        // 璁$畻寰呭叆搴撴暟閲�
-        // 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
-        List<Integer> collect = list.stream().map(CustomStorage::getId).collect(Collectors.toList());
-        if(CollectionUtils.isEmpty( collect)){
-            ExcelUtil<CustomStorage> util = new ExcelUtil<CustomStorage>(CustomStorage.class);
-            util.exportExcel(response, list, "搴撳瓨绠$悊");
-            return;
-        }
-        LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect);
-        procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getType, type);
-        procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getType, type);
-        List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
-        if(CollectionUtils.isEmpty( procurementRecords)){
-            ExcelUtil<CustomStorage> util = new ExcelUtil<CustomStorage>(CustomStorage.class);
-            util.exportExcel(response, list, "搴撳瓨绠$悊");
-            return;
-        }
-        for (CustomStorage dto : list) {
-            // 鏍规嵁閲囪喘鍙拌处ID绛涢�夊搴旂殑鍑哄簱璁板綍
-            List<ProcurementRecordOut> collect1 = procurementRecords.stream()
-                    .filter(ProcurementRecordOut -> ProcurementRecordOut.getProcurementRecordStorageId().equals(dto.getId()))
-                    .collect(Collectors.toList());
-
-            // 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
-            if(CollectionUtils.isEmpty(collect1)){
-                dto.setInboundNum0(dto.getInboundNum());
-                continue;
-            }
-
-            // 璁$畻宸插嚭搴撴暟閲忔�诲拰锛屽苟璁剧疆寰呭嚭搴撴暟閲�
-            BigDecimal totalInboundNum = collect1.stream()
-                    .map(ProcurementRecordOut::getInboundNum)
-                    .reduce(BigDecimal.ZERO, BigDecimal::add);
-
-            // 寰呭嚭搴撴暟閲� = 鎬绘暟閲� - 宸插嚭搴撴暟閲�
-            dto.setInboundNum0(dto.getInboundNum().subtract(totalInboundNum));
-        }
-        ExcelUtil<CustomStorage> util = new ExcelUtil<CustomStorage>(CustomStorage.class);
         util.exportExcel(response, list, "搴撳瓨绠$悊");
     }
 

--
Gitblit v1.9.3