调整预埋件

邱宇豪

2023-09-26 3a6636e5b470c4ea5f5c6bee141939f5393390fc

 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()]);

      //物品名称-规格型号