From fe97e3191aaa5f5db104541946f6ac7937e46e15 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 30 四月 2026 16:10:17 +0800
Subject: [PATCH] 人员考勤统计调整&原材料下单导出检验项详情
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index 19d7e5f..798ccdc 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -51,6 +51,7 @@
import com.ruoyi.inspect.service.InsOrderService;
import com.ruoyi.inspect.service.InsReportService;
import com.ruoyi.inspect.service.RawMaterialOrderService;
+import com.ruoyi.inspect.vo.ProductVo;
import com.ruoyi.performance.mapper.AuxiliaryOutputWorkingHoursMapper;
import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHours;
import com.ruoyi.system.mapper.UserMapper;
@@ -783,6 +784,9 @@
}
}
+ //鏌ヨ妫�楠岄」璁板綍
+ List<Long> ifsIds = ifsByOverList.stream().map(IfsInventoryQuantitySupplierDto::getId).collect(Collectors.toList());
+ List<ProductVo> inspectList = insProductMapper.selectInspectListByIfsIfs(ifsIds);
response.setContentType("application/vnd.ms-excel");
@@ -794,10 +798,12 @@
//鏂板缓ExcelWriter
ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).build();
//鑾峰彇sheet0瀵硅薄
- WriteSheet mainSheet = EasyExcel.writerSheet(0, "鍘熸潗鏂欐娴嬩俊鎭鍑�").head(IfsInventoryQuantitySupplierDto.class).build();
+ WriteSheet mainSheet = EasyExcel.writerSheet(0, "鍘熸潗鏂欐娴嬩俊鎭�昏").head(IfsInventoryQuantitySupplierDto.class).build();
+ WriteSheet inspectSheet = EasyExcel.writerSheet(1, "鍘熸潗鏂欐娴嬫暟鎹鎯�").head(ProductVo.class).build();
//鍚憇heet0鍐欏叆鏁版嵁 浼犲叆绌簂ist杩欐牱鍙鍑鸿〃澶�
excelWriter.write(ifsByOverList, mainSheet);
+ excelWriter.write(inspectList, inspectSheet);
//鍏抽棴娴�
excelWriter.finish();
} catch (IOException e) {
--
Gitblit v1.9.3