|
@@ -182,8 +182,13 @@ public class BatchController {
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
HttpServletRequest req) {
|
|
|
- Result<IPage<KuaiShouCampaign>> result = new Result<IPage<KuaiShouCampaign>>();
|
|
|
+ Result<IPage<KuaiShouCampaign>> result = new Result<>();
|
|
|
+ String campaignName = kuaiShouCampaign.getCampaignName();
|
|
|
+ kuaiShouCampaign.setCampaignName(null);
|
|
|
QueryWrapper<KuaiShouCampaign> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCampaign, req.getParameterMap());
|
|
|
+ if (!Check.isNull(campaignName)) {
|
|
|
+ queryWrapper.like("campaign_name", campaignName);
|
|
|
+ }
|
|
|
queryWrapper.orderByDesc("put_create_time");
|
|
|
Page<KuaiShouCampaign> page = new Page<KuaiShouCampaign>(pageNo, pageSize);
|
|
|
IPage<KuaiShouCampaign> pageList = kuaiShouCampaignService.page(page, queryWrapper);
|
|
@@ -391,7 +396,12 @@ public class BatchController {
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
|
HttpServletRequest req) {
|
|
|
Result<IPage<KuaiShouGroup>> result = new Result<IPage<KuaiShouGroup>>();
|
|
|
+ String unitName = kuaiShouGroup.getUnitName();
|
|
|
+ kuaiShouGroup.setUnitName(null);
|
|
|
QueryWrapper<KuaiShouGroup> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouGroup, req.getParameterMap());
|
|
|
+ if (!Check.isNull(unitName)) {
|
|
|
+ queryWrapper.like("unit_name", unitName);
|
|
|
+ }
|
|
|
queryWrapper.orderByDesc("group_create_time");
|
|
|
Page<KuaiShouGroup> page = new Page<KuaiShouGroup>(pageNo, pageSize);
|
|
|
IPage<KuaiShouGroup> pageList = kuaiShouGroupService.page(page, queryWrapper);
|
|
@@ -698,8 +708,13 @@ public class BatchController {
|
|
|
public Result<IPage<KuaiShouCreative>> getCreativeList(KuaiShouCreative kuaiShouCreative, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
|
|
|
Result<IPage<KuaiShouCreative>> result = new Result<>();
|
|
|
+ String creativeName = kuaiShouCreative.getCreativeName();
|
|
|
+ kuaiShouCreative.setCreativeName(null);
|
|
|
QueryWrapper<KuaiShouCreative> queryWrapper = QueryGenerator.initQueryWrapper(kuaiShouCreative, req.getParameterMap());
|
|
|
- queryWrapper.orderByDesc("creative_id");
|
|
|
+ if (!Check.isNull(creativeName)) {
|
|
|
+ queryWrapper.like("creative_name", creativeName);
|
|
|
+ }
|
|
|
+ queryWrapper.orderByDesc("creative_create_time");
|
|
|
Page<KuaiShouCreative> page = new Page<>(pageNo, pageSize);
|
|
|
IPage<KuaiShouCreative> creativeList = kuaiShouCreativeService.page(page, queryWrapper);
|
|
|
result.setSuccess(true);
|