|
@@ -1,8 +1,6 @@
|
|
package org.jeecg.modules.ctop.controller;
|
|
package org.jeecg.modules.ctop.controller;
|
|
|
|
|
|
-import java.util.Arrays;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
+import java.util.*;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.io.UnsupportedEncodingException;
|
|
import java.io.UnsupportedEncodingException;
|
|
import java.net.URLDecoder;
|
|
import java.net.URLDecoder;
|
|
@@ -14,12 +12,13 @@ import org.jeecg.common.aspect.annotation.AutoLog;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecg.common.util.oConvertUtils;
|
|
import org.jeecg.modules.ctop.entity.Advertiser;
|
|
import org.jeecg.modules.ctop.entity.Advertiser;
|
|
import org.jeecg.modules.ctop.service.IAdvertiserService;
|
|
import org.jeecg.modules.ctop.service.IAdvertiserService;
|
|
-import java.util.Date;
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
|
|
+import org.jeecg.modules.system.entity.SysCategory;
|
|
|
|
+import org.jeecg.modules.system.service.ISysCategoryService;
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
import org.jeecgframework.poi.excel.entity.ExportParams;
|
|
@@ -48,7 +47,8 @@ import io.swagger.annotations.ApiOperation;
|
|
public class AdvertiserController {
|
|
public class AdvertiserController {
|
|
@Autowired
|
|
@Autowired
|
|
private IAdvertiserService advertiserService;
|
|
private IAdvertiserService advertiserService;
|
|
-
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private ISysCategoryService sysCategoryService;
|
|
/**
|
|
/**
|
|
* 分页列表查询
|
|
* 分页列表查询
|
|
* @param advertiser
|
|
* @param advertiser
|
|
@@ -68,6 +68,19 @@ public class AdvertiserController {
|
|
QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
|
|
QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
|
|
Page<Advertiser> page = new Page<Advertiser>(pageNo, pageSize);
|
|
Page<Advertiser> page = new Page<Advertiser>(pageNo, pageSize);
|
|
IPage<Advertiser> pageList = advertiserService.page(page, queryWrapper);
|
|
IPage<Advertiser> pageList = advertiserService.page(page, queryWrapper);
|
|
|
|
+ if (pageList != null && pageList.getRecords() != null && pageList.getRecords().size() > 0) {
|
|
|
|
+ List<Advertiser> list = new ArrayList<>();
|
|
|
|
+ for (int i = 0; i < pageList.getRecords().size(); i++) {
|
|
|
|
+ Advertiser advertiserRecord = pageList.getRecords().get(i);
|
|
|
|
+ SysCategory sysCategory = sysCategoryService.getById(advertiserRecord.getIndustryId());
|
|
|
|
+
|
|
|
|
+ if (sysCategory != null) {
|
|
|
|
+ advertiserRecord.setIndustryId(sysCategory.getName());
|
|
|
|
+ }
|
|
|
|
+ list.add(advertiserRecord);
|
|
|
|
+ }
|
|
|
|
+ pageList.setRecords(list);
|
|
|
|
+ }
|
|
result.setSuccess(true);
|
|
result.setSuccess(true);
|
|
result.setResult(pageList);
|
|
result.setResult(pageList);
|
|
return result;
|
|
return result;
|