|
@@ -30,10 +30,13 @@ public class DataExportController {
|
|
|
@RequestParam(required = false) String construction_method,
|
|
@RequestParam(required = false) String construction_method,
|
|
|
@RequestParam(required = false) String timeRange ,
|
|
@RequestParam(required = false) String timeRange ,
|
|
|
HttpServletRequest request, HttpServletResponse response) {
|
|
HttpServletRequest request, HttpServletResponse response) {
|
|
|
|
|
+ String[] timeStr =new String[]{null,null};
|
|
|
try {
|
|
try {
|
|
|
- String[] timeStr = timeRange.split(",");
|
|
|
|
|
- if (timeStr.length != 2) {
|
|
|
|
|
- return MessageManage.getInstance().getResultContent(-1,"timeRange不可用","timeRange不可用");
|
|
|
|
|
|
|
+ if (c_clue_name != null) {
|
|
|
|
|
+ timeStr = timeRange.split(",");
|
|
|
|
|
+ if (timeStr.length != 2) {
|
|
|
|
|
+ return MessageManage.getInstance().getResultContent(-1,"timeRange不可用","timeRange不可用");
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
List<Map<String, Object>> data = dataExportService.exportClue(c_clue_name,c_enterprise_name,construction_method,timeStr[0],timeStr[1]);
|
|
List<Map<String, Object>> data = dataExportService.exportClue(c_clue_name,c_enterprise_name,construction_method,timeStr[0],timeStr[1]);
|
|
|
FileUtil.exportExcelWithPreDefinedHeader(
|
|
FileUtil.exportExcelWithPreDefinedHeader(
|