修改数据查询

src/main/java/org/springblade/sing/active/controller/ActiveProductRecordController.java

@@ -143,15 +143,8 @@ public class ActiveProductRecordController extends BladeController {
 			R<IPage<ActiveProductRecordVO>> page = this.list(activeProductRecord, query, createTimeStart, createTimeEnd, key);
 			//判断是否为空
 			if (ObjectUtils.isNotEmpty(page) && ObjectUtils.isNotEmpty(page.getData()) && ObjectUtils.isNotEmpty(page.getData().getRecords())) {
-				page.getData().getRecords().forEach(ele -> {
-					ActiveRecord activeRecord = activeRecordService.getById(ele.getActiveId());
-					if (ObjectUtils.isNotEmpty(activeRecord)) {
-						ele.setActiveName(activeRecord.getTitle());
-					}
-				});
 				//键值对
 				Map<String, String> titleMap = JSONObject.parseObject(keyValue, Map.class);
-				titleMap.put(BeanPropertyUtil.getFieldName(ActiveProductRecordVO::getActiveName), "活动名称");
 				if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(titleMap)) {
 					//写入到Excel
 					ExcelWriteUtil.writeToResponse(response, DateUtil.now(), "提现记录表", titleMap, page.getData().getRecords(), ActiveProductRecordVO.class);

src/main/java/org/springblade/sing/active/wrapper/ActiveProductRecordWrapper.java

@@ -16,11 +16,15 @@
  */
 package org.springblade.sing.active.wrapper;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import org.springblade.common.utils.SpringContextHolder;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.gateway.active_gateway.constant.ActiveProductConstant;
 import org.springblade.sing.active.entity.ActiveProductRecord;
+import org.springblade.sing.active.entity.ActiveRecord;
+import org.springblade.sing.active.service.IActiveRecordService;
 import org.springblade.sing.active.vo.ActiveProductRecordVO;
 import java.util.Objects;
 
@@ -34,6 +38,8 @@ public class ActiveProductRecordWrapper extends BaseEntityWrapper<ActiveProductR
 
 	private BladeRedis bladeRedis;
 
+	private IActiveRecordService activeRecordService = SpringContextHolder.getBean(IActiveRecordService.class);
+
 	public ActiveProductRecordWrapper(BladeRedis bladeRedis) {
 		this.bladeRedis = bladeRedis;
 	}
@@ -61,6 +67,14 @@ public class ActiveProductRecordWrapper extends BaseEntityWrapper<ActiveProductR
 				activeProductRecordVO.setRank(revrank + 1);
 			}
 		}
+
+		//添加活动数据
+		ActiveRecord activeRecord = activeRecordService.getById(activeProductRecordVO.getActiveId());
+		if (ObjectUtils.isNotEmpty(activeRecord)) {
+			activeProductRecordVO.setActiveName(activeRecord.getTitle());
+		}
+
+
 		//User createUser = UserCache.getUser(activeProductRecord.getCreateUser());
 		//User updateUser = UserCache.getUser(activeProductRecord.getUpdateUser());
 		//activeProductRecordVO.setCreateUserName(createUser.getName());