|
|
@@ -296,6 +296,15 @@ public class DataController {
|
|
|
|
|
|
@PostMapping("listData")
|
|
|
public HttpResult listData(@RequestBody DataQuery dataQuery){
|
|
|
+
|
|
|
+ if((dataQuery.getStartDate() == null || "".equals(dataQuery.getStartDate()))&& (dataQuery.getEndDate() == null || "".equals(dataQuery.getEndDate()))) {
|
|
|
+ // 获取当前日期
|
|
|
+ LocalDate currentDate = LocalDate.now();
|
|
|
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
+ dataQuery.setStartDate(currentDate.format(formatter) + " 00:00:00");
|
|
|
+ dataQuery.setEndDate(currentDate.format(formatter) + " 23:59:59");
|
|
|
+ }
|
|
|
+
|
|
|
List<CompanyData> sumData = dataService.getCompanyOrderStatusData(dataQuery);
|
|
|
List<ListData> listDatas = new ArrayList<>();
|
|
|
|