修改导出功能

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

@@ -117,9 +117,9 @@ public class ActiveProductRecordController extends BladeController {
 												Date createTimeStart, Date createTimeEnd, String key) {
 		LambdaQueryWrapper<ActiveProductRecord> activeProductRecordLambdaQueryWrapper = Condition.getQueryWrapper(activeProductRecord).lambda();
 		//添加创建时间条件
-		activeProductRecordLambdaQueryWrapper.between(ObjectUtils.isNotEmpty(createTimeStart) && ObjectUtils.isNotEmpty(createTimeEnd),ActiveProductRecord::getCreateTime, createTimeStart, createTimeEnd);
+		activeProductRecordLambdaQueryWrapper.between(ObjectUtils.isNotEmpty(createTimeStart) && ObjectUtils.isNotEmpty(createTimeEnd), ActiveProductRecord::getCreateTime, createTimeStart, createTimeEnd);
 		//添加关键字key查询条件
-		activeProductRecordLambdaQueryWrapper.and(StringUtils.isNotBlank(key),wq -> wq.likeRight(ActiveProductRecord::getProductNo, key).
+		activeProductRecordLambdaQueryWrapper.and(StringUtils.isNotBlank(key), wq -> wq.likeRight(ActiveProductRecord::getProductNo, key).
 			or().like(ActiveProductRecord::getTitle, key));
 		activeProductRecordLambdaQueryWrapper.orderByAsc(ActiveProductRecord::getProductNo);
 		IPage<ActiveProductRecord> pages = activeProductRecordService.page(Condition.getPage(query), activeProductRecordLambdaQueryWrapper);
@@ -143,8 +143,16 @@ 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.remove(BeanPropertyUtil.getFieldName(ActiveProductRecordVO::getActiveId));
+				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);
@@ -208,7 +216,7 @@ public class ActiveProductRecordController extends BladeController {
 	@ApiOperation(value = "新增或修改", notes = "传入activeProductRecord")
 	public R submit(@Valid @RequestBody ActiveProductRecord activeProductRecord) {
 		//默认设置0票
-		if(ObjectUtils.isEmpty(activeProductRecord.getVoteCount())){
+		if (ObjectUtils.isEmpty(activeProductRecord.getVoteCount())) {
 			activeProductRecord.setVoteCount(0L);
 		}
 		return R.status(activeProductRecordService.saveOrUpdate(setProductNo(activeProductRecord)) && ActiveProductUtil.addProductRank(activeProductRecord));

src/main/java/org/springblade/sing/active/vo/ActiveProductRecordVO.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.sing.active.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.sing.active.entity.ActiveProductRecord;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -46,6 +47,9 @@ public class ActiveProductRecordVO extends ActiveProductRecord {
 	//用户头像
 	private String userImg;
 
+	@ApiModelProperty("活动名称")
+	private String activeName;
+
 	/**
 	 * 活动开始时间
 	 */