Commit 8747a230 by huluobin

4.0报表

parent 43a0cdaf
......@@ -52,7 +52,7 @@ public interface AdminFeign {
@PostMapping(value = "/api/Report/RevenueSumApi",
consumes = MediaType.APPLICATION_JSON_UTF8_VALUE,
produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
AdminResult<Map<String, Object>> revenueSumApi(@RequestBody RevenueSumApiRequest request);
AdminResult<List<Map<String, Object>>> revenueSumApi(@RequestBody RevenueSumApiRequest request);
@Component
......@@ -85,7 +85,7 @@ public interface AdminFeign {
}
@Override
public AdminResult<Map<String, Object>> revenueSumApi(RevenueSumApiRequest request) {
public AdminResult<List<Map<String, Object>>> revenueSumApi(RevenueSumApiRequest request) {
return new AdminResult<>();
}
}
......
......@@ -52,7 +52,7 @@ public class DashboardController {
}
@PostMapping("/revenueSumApi")
public JsonResult<Map<String, Object>> revenueSumApi(RevenueSumApiRequest request) {
public JsonResult<List<Map<String, Object>>> revenueSumApi(RevenueSumApiRequest request) {
return JsonResult.success(adminFeign.revenueSumApi(request).getData());
}
}
......@@ -111,7 +111,7 @@ public class AdminFeignTest {
request.setDateUtc(Lists.newArrayList(ZonedDateTime.of(LocalDateTime.of(2020, 6, 30, 0, 0), ZoneOffset.UTC).toString(),
ZonedDateTime.of(LocalDateTime.of(2020, 7, 30, 0, 0), ZoneOffset.UTC).toString()));
AdminResult<Map<String, Object>> result = adminFeign.revenueSumApi(request);
AdminResult<List<Map<String, Object>>> result = adminFeign.revenueSumApi(request);
log.info(JsonUtilByJackson.writeValueAsString(result));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment