From 95caf74f05712c6556128eca180d555f427e289e Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期三, 27 九月 2023 09:56:31 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentRecordServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentRecordServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentRecordServiceImpl.java
index 73740a3..398276d 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentRecordServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentRecordServiceImpl.java
@@ -9,6 +9,7 @@
import com.thhy.general.exception.BasicException;
import com.thhy.general.utils.ExcelUtils;
import com.thhy.general.utils.UserInfoUtils;
+import com.thhy.materials.modules.biz.embedment.dto.EmbedmentGoodsDto;
import com.thhy.materials.modules.biz.embedment.dto.EmbedmentRecordDto;
import com.thhy.materials.modules.biz.embedment.entity.SysEmbedmentGoodsEntity;
import com.thhy.materials.modules.biz.embedment.entity.SysEmbedmentRecordEntity;
@@ -142,7 +143,8 @@
}
@Override
- public void recordExportTemplate(EmbedmentRecordDto embedmentRecordDto, HttpServletResponse response) {
+ public void recordExportTemplate(EmbedmentGoodsDto embedmentGoodsDto, HttpServletResponse response) {
+ embedmentGoodsDto = new EmbedmentGoodsDto();
SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
String companyId = sysUserInfo.getCompanyId();
XSSFWorkbook book = new XSSFWorkbook();
@@ -153,8 +155,8 @@
row.createCell(2).setCellValue("单价");
row.createCell(3).setCellValue("金额");
row.createCell(4).setCellValue("备注");
- embedmentRecordDto.setCompanyId(companyId);
- List<String> lx = sysEmbedmentRecordMapper.embedmentRecordList(embedmentRecordDto).stream().map(s -> s.getEmbedmentNameAndModel()).collect(Collectors.toList());
+ embedmentGoodsDto.setCompanyId(companyId);
+ List<String> lx = sysEmbedmentGoodsMapper.findAll(embedmentGoodsDto).stream().map(s -> s.getEmbedmentName()+"-"+s.getEmbedmentModel()).collect(Collectors.toList());
String[] gjlx = lx.toArray(new String[lx.size()]);
//物品名称-规格型号
--
Gitblit v1.9.3