From e7ca529fef439c685c34bf3c3fb68ab3d0517bc1 Mon Sep 17 00:00:00 2001 From: "xiaodong.hu" <1075471126@qq.com> Date: Fri, 25 Aug 2023 15:24:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AF=BC=E5=85=A5=E4=BA=94?= =?UTF-8?q?=E7=99=BE=E8=B6=85=E5=87=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/constants/ExcelErrorConstants.java | 2 ++ .../com/cool/store/service/impl/LineHighSeasServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/ExcelErrorConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/ExcelErrorConstants.java index 791539285..eb3b563d6 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/ExcelErrorConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/ExcelErrorConstants.java @@ -27,4 +27,6 @@ public class ExcelErrorConstants { public static final String INVESTMENT_MANAGER_LOSE = "未找到此招商经理，请核实"; + public static final String COUNT_MORE = "每次数据最多导入500条，请分批上传"; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java index b769f7911..3de180c12 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java @@ -136,13 +136,14 @@ public class LineHighSeasServiceImpl implements LineHighSeasService { if (lineDOList.size() > excelMaxSize) { //超出五百条的excel都标红 for (int i = excelMaxSize; i < lineDOList.size() ; i++) { + lineDOList.get(i).setErrorInfo(ExcelErrorConstants.COUNT_MORE); styleCells.put(i,new HashMap<>(4)); } ExcelUtil.setRowStyle(styleCells,ExcelUtil.FONT_RED,7); util.exportExcel(outputStream, lineDOList, "", styleCells); InputStream stream = new ByteArrayInputStream(outputStream.toByteArray()); String fileStr = ossServer.uploadFileServer(stream, dir + getExcelName()); - return new ResponseResult(500, "每次数据最多导入500条，请分批上传", new ErrorExcelResponse(lineDOList.size(), excelMaxSize, fileStr)); + return new ResponseResult(500, "共上传" + lineDOList.size() + "条线索，其中" + styleCells.size() + "条存在异常", new ErrorExcelResponse(lineDOList.size(), styleCells.size(), fileStr)); } for (int i = 0; i < lineDOList.size(); i++) { HyPartnerLineDO hyPartnerLineDO = lineDOList.get(i);