|
@@ -38,6 +38,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
|
|
|
@Api(tags = "screen-大屏")
|
|
@@ -309,9 +310,11 @@ public class ScreenAnalysisController extends BaseController {
|
|
|
@ApiOperation("会员新增趋势")
|
|
|
public JsonResult<List<ScreenMemberTrendVO>> memberTrend(HttpServletRequest request,
|
|
|
@RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite,
|
|
|
- @RequestParam(value = "startTime", required = true) String startTime,
|
|
|
- @RequestParam(value = "endTime", required = true) String endTime) {
|
|
|
- return SldResponse.success(memberModel.getMemberTrend(webSite,startTime,endTime));
|
|
|
+ @RequestParam(value = "startTime", required = true) Date startTime,
|
|
|
+ @RequestParam(value = "endTime", required = true) Date endTime) {
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy--MM--dd mm:HH:ss");
|
|
|
+
|
|
|
+ return SldResponse.success(memberModel.getMemberTrend(webSite,sdf.format(startTime),sdf.format(endTime)));
|
|
|
}
|
|
|
|
|
|
|