高级检索导出将/替换为空
This commit is contained in:
+6
-6
@@ -76,6 +76,7 @@ import java.net.URLEncoder;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
import java.util.concurrent.ForkJoinPool;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -1361,7 +1362,7 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
|
||||
|
||||
private ModelAndView exportExcelByClause(Map<String, Object> parameterMap) {
|
||||
List<LawsHomeAdvancedSearchClauseVO> advancedSearchClause = getAdvancedSearchClauseExport(parameterMap);
|
||||
List<Map<String, Object>> list = new ArrayList<>();
|
||||
List<Map<String, Object>> list = new CopyOnWriteArrayList<>();
|
||||
|
||||
// 标准sheet页
|
||||
List<LawsHomeAdvancedSearchStandardExcelVO> lawsHomeAdvancedSearchStandardExcelVOList =
|
||||
@@ -1373,14 +1374,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
|
||||
standardSheet.put(NormalExcelConstants.PARAMS, exportParams);
|
||||
standardSheet.put(NormalExcelConstants.DATA_LIST, lawsHomeAdvancedSearchStandardExcelVOList);
|
||||
list.add(standardSheet);
|
||||
|
||||
for (LawsHomeAdvancedSearchClauseVO lawsHomeAdvancedSearchClauseVO : advancedSearchClause) {
|
||||
List<Map<String, Object>> clauseList = lawsHomeAdvancedSearchClauseVO.getClauseList();
|
||||
List<LawsHomeAdvancedSearchClauseExcelVO> lawsHomeAdvancedSearchClauseExcelVOS =
|
||||
JSON.parseArray(JSON.toJSONString(clauseList), LawsHomeAdvancedSearchClauseExcelVO.class);
|
||||
// 条款详情
|
||||
for (LawsHomeAdvancedSearchClauseExcelVO lawsHomeAdvancedSearchClauseExcelVO :
|
||||
lawsHomeAdvancedSearchClauseExcelVOS) {
|
||||
lawsHomeAdvancedSearchClauseExcelVOS.parallelStream().forEach(lawsHomeAdvancedSearchClauseExcelVO->{
|
||||
List<SarFileSplitItemsValEO> sarFileSplitItemsValEOS = sarFileSplitItemsValEOMapper.findList(
|
||||
new QueryWrapper<SarFileSplitItemsValEO>()
|
||||
.eq("item_id", lawsHomeAdvancedSearchClauseExcelVO.getId())
|
||||
@@ -1393,11 +1392,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
|
||||
.collect(Collectors.joining("\n\r"));
|
||||
lawsHomeAdvancedSearchClauseExcelVO.setItemContent(itemContents);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// 条款sheet页
|
||||
Map<String, Object> clauseSheet = new HashMap<>();
|
||||
clauseSheet.put(NormalExcelConstants.CLASS, LawsHomeAdvancedSearchClauseExcelVO.class);
|
||||
ExportParams exportParamss = new ExportParams(null, lawsHomeAdvancedSearchClauseVO.getStandardNumber());
|
||||
ExportParams exportParamss = new ExportParams(null, lawsHomeAdvancedSearchClauseVO.getStandardNumber().replace("/"," "));
|
||||
exportParamss.setType(ExcelType.XSSF);
|
||||
clauseSheet.put(NormalExcelConstants.PARAMS, exportParamss);
|
||||
clauseSheet.put(NormalExcelConstants.DATA_LIST, lawsHomeAdvancedSearchClauseExcelVOS);
|
||||
|
||||
Reference in New Issue
Block a user