diff --git a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java index a6dc65e2e8..d96be6a985 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java +++ b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java @@ -212,7 +212,7 @@ public class EmailTaskHandler extends TaskHandler implements Job { List viewIdList = Arrays.asList(viewIds.split(",")).stream().map(s -> s.trim()).filter(viewId -> StringUtils.isNotBlank(viewId) && viewOptionIdList.contains(viewId)).collect(Collectors.toList()); PermissionProxy proxy = new PermissionProxy(); proxy.setUserId(user.getUserId()); - files = viewExportExcel.export(panelId, viewIdList, proxy, justExportView); + files = viewExportExcel.export(panelId, viewIdList, proxy, justExportView, taskInstance.getTaskId().toString()); } List channels = null; diff --git a/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java b/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java index baa47a3053..d442916cf0 100644 --- a/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java +++ b/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java @@ -40,7 +40,7 @@ public class ViewExportExcel { }.getType(); @DePermissionProxy(paramIndex = 2) - public List export(String panelId, List viewIds, PermissionProxy proxy, Boolean justView) throws Exception { + public List export(String panelId, List viewIds, PermissionProxy proxy, Boolean justView, String taskId) throws Exception { if (CollectionUtils.isEmpty(viewIds)) { return null; } @@ -51,7 +51,7 @@ public class ViewExportExcel { Map stringChartExtRequestMap = buildViewRequest(panelDto, justView); List results = new ArrayList<>(); List sheets = viewIds.stream().map(viewId -> viewFiles(viewId, stringChartExtRequestMap.get(viewId))).collect(Collectors.toList()); - File excelFile = ExcelUtils.exportExcel(sheets, panelDto.getName(), panelDto.getId()); + File excelFile = ExcelUtils.exportExcel(sheets, panelDto.getName(), panelDto.getId() + "_" + taskId); results.add(excelFile); return results; } diff --git a/backend/src/main/java/io/dataease/service/chart/build/NumberRangeBuild.java b/backend/src/main/java/io/dataease/service/chart/build/NumberRangeBuild.java index 42ea023770..abcec34ca9 100644 --- a/backend/src/main/java/io/dataease/service/chart/build/NumberRangeBuild.java +++ b/backend/src/main/java/io/dataease/service/chart/build/NumberRangeBuild.java @@ -7,8 +7,10 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Service("numberRangeWidget") public class NumberRangeBuild extends FilterBuildTemplate { @@ -24,18 +26,22 @@ public class NumberRangeBuild extends FilterBuildTemplate { Map options = null; List values = null; - if((optionObj = component.get("options")) != null && (valueObj = (options = (Map) optionObj).get("value")) != null && CollectionUtil.isNotEmpty((values = (List) valueObj))) { + if ((optionObj = component.get("options")) != null && (valueObj = (options = (Map) optionObj).get("value")) != null) { + if (valueObj instanceof List) { + values = (List) valueObj; + } else { + return result; + } String min = values.get(0); String max = null; - if(values.size() > 1) { + if (values.size() > 1) { max = values.get(1); } result.setOperator("between"); - result.getValue().set(0, min); - result.getValue().set(1, max); if (StringUtils.isNotBlank(min) && StringUtils.isNotBlank(max)) { + result.setValue(values); return result; }