feat(controller): 积分包结算导出，结算包结算导出

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -1,5 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
@@ -179,10 +180,15 @@ public class WmPayOffController {
 		input.setTypeid("4");
 		input.setSettleFlag("1");
 		List<WmScorePackageSettleOutput> list = wmScorePackageService.listAllPackageSettle(input);
-		// 转换为导出实体
 		List<WmScorePackageSettleExcelModel> exportList = new ArrayList<>();
-		list.forEach(settleOutput -> {
+		if (CollectionUtil.isEmpty(list)) {
+			return new ArrayList<>();
+		}
+		// 转换为导出实体
+		for (int i = 0; i < list.size(); i++) {
+			WmScorePackageSettleOutput settleOutput = list.get(i);
 			WmScorePackageSettleExcelModel export = new WmScorePackageSettleExcelModel();
+			export.setNumber(i + 1);
 			export.setScorePackageName(settleOutput.getScorePackageName());
 			export.setPackageType1(PackageTypeEnum.type1Resolve(settleOutput.getPackageType1()).getName());
 			export.setPackageEntName(settleOutput.getPackageEntName());
@@ -196,7 +202,7 @@ public class WmPayOffController {
 			export.setSettleStatus(SettleStatusEnum.resolve(settleOutput.getSettleStatus()).getName());
 			export.setBelongDate(settleOutput.getBelongDate());
 			exportList.add(export);
-		});
+		}
 
 		return exportList;
 	}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageSettleNoteController.java

@@ -1,14 +1,17 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
+import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.entity.WmScorePackageSettleNote;
 import com.qunzhixinxi.hnqz.admin.entity.model.excel.WmSettlePackageSettleExcelModel;
 import com.qunzhixinxi.hnqz.admin.entity.output.WmTaskSettleNoteOutput;
 import com.qunzhixinxi.hnqz.admin.enums.SettleStatusEnum;
 import com.qunzhixinxi.hnqz.admin.enums.SubjectTypeEnum;
+import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageSettleNoteService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
@@ -42,6 +45,7 @@ import java.util.List;
 public class WmScorePackageSettleNoteController {
 
 	private final WmScorePackageSettleNoteService wmScorePackageSettleNoteService;
+	private final WmScorePackageService wmScorePackageService;
 
 	/**
 	 * 分页查询任务+结算信息
@@ -108,10 +112,17 @@ public class WmScorePackageSettleNoteController {
 			note.setEndSubTime(endSubTime);
 		}
 		List<WmTaskSettleNoteOutput> list = wmScorePackageSettleNoteService.listWmTaskForSettle(note);
+		if (CollectionUtil.isEmpty(list)) {
+			return new ArrayList<>();
+		}
 		// 转换为导出实体
+		WmScorePackage scorePackage = wmScorePackageService.getById(note.getPackageId());
 		List<WmSettlePackageSettleExcelModel> exportList = new ArrayList<>();
-		list.forEach(settleNoteOutput -> {
+		for (int i = 0; i < list.size(); i++) {
+			WmTaskSettleNoteOutput settleNoteOutput = list.get(i);
 			WmSettlePackageSettleExcelModel excelModel = new WmSettlePackageSettleExcelModel();
+			excelModel.setNumber(i + 1);
+			excelModel.setScorePackageName(scorePackage.getScorePackageName());
 			excelModel.setRealName(settleNoteOutput.getRealName());
 			excelModel.setTaskTypeName(settleNoteOutput.getTaskTypeName());
 			excelModel.setXmbm(settleNoteOutput.getXmbm());
@@ -123,7 +134,7 @@ public class WmScorePackageSettleNoteController {
 			excelModel.setNotifyTime(settleNoteOutput.getNotifyTime());
 			excelModel.setSettleNoteStatus(SettleStatusEnum.resolve(String.valueOf(settleNoteOutput.getSettleNoteStatus())).getName());
 			exportList.add(excelModel);
-		});
+		}
 
 		return exportList;
 	}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/model/excel/WmScorePackageSettleExcelModel.java

@@ -18,6 +18,10 @@ import java.time.LocalDateTime;
 @Data
 public class WmScorePackageSettleExcelModel {
 
+	@ColumnWidth(10)
+	@ExcelProperty("序号")
+	private Integer number;
+
 	/**
 	 * 积分包名称
 	 */

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/model/excel/WmSettlePackageSettleExcelModel.java

@@ -16,6 +16,14 @@ import java.time.LocalDateTime;
 @Data
 public class WmSettlePackageSettleExcelModel {
 
+	@ColumnWidth(10)
+	@ExcelProperty("序号")
+	private Integer number;
+
+	@ColumnWidth(40)
+	@ExcelProperty("积分包名称")
+	private String scorePackageName;
+
 	/**
 	 * 任务成员
 	 */