From cccd16603f4b0d8ee932e09a5648a3c725bed0fe Mon Sep 17 00:00:00 2001 From: jing's Date: Thu, 7 Dec 2023 10:53:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/api/user/OptionalEbomApi.java | 12 ++++++--- .../product/bomnew/excel/EasyExcelUtil.java | 12 ++++++--- .../OptionalEbomImportChildService.java | 26 ++++++++++++++++--- 3 files changed, 38 insertions(+), 12 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java index 63b9adf4..1b57ade8 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java @@ -200,10 +200,14 @@ public class OptionalEbomApi extends BaseApi { dto.setParentRowId(null); } - if(this.optionalEbomImportChildService.insertOption(dto)){ - return ResultVO.success(true); - }else{ - return ResultVO.error(STATE.Error,"添加配置失败"); + try { + if (this.optionalEbomImportChildService.insertOption(dto)) { + return ResultVO.success(true); + } else { + return ResultVO.error(STATE.Error, "添加配置失败"); + } + }catch (NflgBusinessException e){ + return ResultVO.error(e.getState(), e.getMsg()); } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/EasyExcelUtil.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/EasyExcelUtil.java index 9765d82e..ef3030d3 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/EasyExcelUtil.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/excel/EasyExcelUtil.java @@ -8,6 +8,7 @@ import com.alibaba.excel.write.handler.CellWriteHandler; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont; import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; +import com.nflg.product.bomnew.util.EecExcelUtil; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.IndexedColors; @@ -141,10 +142,13 @@ public class EasyExcelUtil { public static void setExportHeader(HttpServletResponse response, String fileName) throws Exception { - response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - response.setCharacterEncoding("utf-8"); - fileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20"); - response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); +// response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); +// response.setCharacterEncoding("utf-8"); +// fileName = URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20"); +// response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + + EecExcelUtil.setResponseExcelHeader(response, fileName); + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java index 28ba6714..e03e43fa 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomImportChildService.java @@ -1,5 +1,6 @@ package com.nflg.product.bomnew.service; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.TypeReference; @@ -15,17 +16,17 @@ import com.nflg.product.bomnew.pojo.dto.OptionalEbomImportChildAddDTO; import com.nflg.product.bomnew.pojo.dto.OptionalEbomImportChildDTO; import com.nflg.product.bomnew.pojo.dto.OptionalEbomMainDelDTO; import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportChildEntity; +import com.nflg.product.bomnew.pojo.entity.OptionalEbomImportEntity; import com.nflg.product.bomnew.pojo.query.OptionalEbomImportChildQuery; import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO; import com.nflg.product.bomnew.pojo.vo.OptionalEbomImportChildVO; +import nflg.product.common.constant.STATE; import org.apache.ibatis.annotations.Param; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import javax.annotation.Resource; +import java.util.*; import java.util.stream.Collectors; /** @@ -34,6 +35,10 @@ import java.util.stream.Collectors; @Service public class OptionalEbomImportChildService extends ServiceImpl { + + @Resource + private OptionalEbomImportService optionalEbomImportService; + public List getByRootRowIdList(Long rootRowId) { return getBaseMapper().getByRootRowIdList(rootRowId); } @@ -52,12 +57,25 @@ public class OptionalEbomImportChildService extends ServiceImpl listNo = Arrays.stream(array).collect(Collectors.toList()); List materialListVo = SpringUtil.getBean(MaterialMainService.class).initMaterialForAnyNo(listNo); + if(CollectionUtil.isEmpty(materialListVo)){ + throw new NflgBusinessException(STATE.BusinessError,"未查询到图号/物料相关数据"); + } List optionList = Convert.convert(new TypeReference>() { }, materialListVo);