suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828

Browse Source
This commit is contained in:
zhangchenbiao
2023-08-25 15:30:03 +08:00
parent c63ed57b99 efcaf70f79
commit 65a69c8c6c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/src/main/java/com/cool/store/constants/ExcelErrorConstants.java
View File

@@ -27,4 +27,6 @@ public class ExcelErrorConstants {
public static final String INVESTMENT_MANAGER_LOSE = "未找到此招商经理，请核实"; public static final String INVESTMENT_MANAGER_LOSE = "未找到此招商经理，请核实";
public static final String COUNT_MORE = "每次数据最多导入500条，请分批上传";
} }

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineHighSeasServiceImpl.java
View File

@@ -136,13 +136,14 @@ public class LineHighSeasServiceImpl implements LineHighSeasService {
if (lineDOList.size() > excelMaxSize) { if (lineDOList.size() > excelMaxSize) {
//超出五百条的excel都标红 //超出五百条的excel都标红
for (int i = excelMaxSize; i < lineDOList.size() ; i++) { for (int i = excelMaxSize; i < lineDOList.size() ; i++) {
lineDOList.get(i).setErrorInfo(ExcelErrorConstants.COUNT_MORE);
styleCells.put(i,new HashMap<>(4)); styleCells.put(i,new HashMap<>(4));
} }
ExcelUtil.setRowStyle(styleCells,ExcelUtil.FONT_RED,7); ExcelUtil.setRowStyle(styleCells,ExcelUtil.FONT_RED,7);
util.exportExcel(outputStream, lineDOList, "", styleCells); util.exportExcel(outputStream, lineDOList, "", styleCells);
InputStream stream = new ByteArrayInputStream(outputStream.toByteArray()); InputStream stream = new ByteArrayInputStream(outputStream.toByteArray());
String fileStr = ossServer.uploadFileServer(stream, dir + getExcelName()); 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++) { for (int i = 0; i < lineDOList.size(); i++) {
HyPartnerLineDO hyPartnerLineDO = lineDOList.get(i); HyPartnerLineDO hyPartnerLineDO = lineDOList.get(i);