فهرست منبع

修改广告主行业为分类字典

xuzuoyun 5 سال پیش
والد
کامیت
293cc9d8c2

+ 18 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java

@@ -1,8 +1,6 @@
 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.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -14,12 +12,13 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.Advertiser;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
-import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -48,7 +47,8 @@ import io.swagger.annotations.ApiOperation;
 public class AdvertiserController {
 	@Autowired
 	private IAdvertiserService advertiserService;
-	
+	 @Autowired
+	 private ISysCategoryService sysCategoryService;
 	/**
 	  * 分页列表查询
 	 * @param advertiser
@@ -68,6 +68,19 @@ public class AdvertiserController {
 		QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
 		Page<Advertiser> page = new Page<Advertiser>(pageNo, pageSize);
 		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.setResult(pageList);
 		return result;

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -92,7 +92,7 @@ spring:
         master:
           url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: root
-          password: root
+          password:
           driver-class-name: com.mysql.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:

+ 1 - 1
jeecg-boot-module-system/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: dev
 swagger:
   production: false
   basic: