Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
commit
8166b61565
|
|
@ -123,12 +123,24 @@ public class DiscSpinningController {
|
||||||
return Result.success();
|
return Result.success();
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/app/discSpinning/selectDiscSpinning")
|
@GetMapping("/discSpinning/selectDiscSpinning")
|
||||||
@ApiImplicitParams({
|
@ApiImplicitParams({
|
||||||
@ApiImplicitParam(name = "source", value = "1 普通转盘 2 周任务转盘 3 月任务转盘", dataTypeClass = Integer.class),
|
@ApiImplicitParam(name = "source", value = "1 普通转盘 2 周任务转盘 3 月任务转盘", dataTypeClass = Integer.class),
|
||||||
})
|
})
|
||||||
@ApiOperation("查询大转盘")
|
@ApiOperation("查询大转盘")
|
||||||
public Result selectDiscSpinning(@RequestParam(required = false, defaultValue = "1") Integer source) {
|
public Result selectDiscSpinning(@RequestParam(required = false, defaultValue = "1") Integer source) {
|
||||||
|
PageHelper.startPage(1, 20);
|
||||||
|
List<DiscSpinning> list = discSpinningService.list(
|
||||||
|
new QueryWrapper<DiscSpinning>().eq("disc_type", source).orderByAsc("disc_type", "odds"));
|
||||||
|
return Result.success().put("data", PageUtils.page(new PageInfo<>(list), true));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/app/discSpinning/selectDiscSpinning")
|
||||||
|
@ApiImplicitParams({
|
||||||
|
@ApiImplicitParam(name = "source", value = "1 普通转盘 2 周任务转盘 3 月任务转盘", dataTypeClass = Integer.class),
|
||||||
|
})
|
||||||
|
@ApiOperation("查询大转盘")
|
||||||
|
public Result appDiscSpinning(@RequestParam(required = false, defaultValue = "1") Integer source) {
|
||||||
PageHelper.startPage(1, 20);
|
PageHelper.startPage(1, 20);
|
||||||
List<DiscSpinning> list = discSpinningService.list(
|
List<DiscSpinning> list = discSpinningService.list(
|
||||||
new QueryWrapper<DiscSpinning>().eq("disc_type", source).orderByAsc("disc_type", "odds"));
|
new QueryWrapper<DiscSpinning>().eq("disc_type", source).orderByAsc("disc_type", "odds"));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue