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

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

@@ -7,6 +7,7 @@ import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
 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.WmScorePackageSettleNoteService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
@@ -120,7 +121,7 @@ public class WmScorePackageSettleNoteController {
 			excelModel.setSubType(SubjectTypeEnum.resolve(settleNoteOutput.getSubType()).getDesc());
 			excelModel.setSubTime(settleNoteOutput.getSubTime());
 			excelModel.setNotifyTime(settleNoteOutput.getNotifyTime());
-			excelModel.setSettleNoteStatus(settleNoteOutput.getSettleNoteStatus());
+			excelModel.setSettleNoteStatus(SettleStatusEnum.resolve(String.valueOf(settleNoteOutput.getSettleNoteStatus())).getName());
 			exportList.add(excelModel);
 		});
 

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

@@ -40,7 +40,7 @@ public class WmSettlePackageSettleExcelModel {
 	/**
 	 * 上传时间
 	 */
-	@ColumnWidth(15)
+	@ColumnWidth(20)
 	@ExcelProperty("上传时间")
 	private LocalDateTime createTime;
 
@@ -68,14 +68,14 @@ public class WmSettlePackageSettleExcelModel {
 	/**
 	 * 提交时间
 	 */
-	@ColumnWidth(15)
+	@ColumnWidth(20)
 	@ExcelProperty("提交时间")
 	private LocalDateTime subTime;
 
 	/**
 	 * 回调时间
 	 */
-	@ColumnWidth(15)
+	@ColumnWidth(20)
 	@ExcelProperty("结算时间")
 	private LocalDateTime notifyTime;
 
@@ -84,6 +84,6 @@ public class WmSettlePackageSettleExcelModel {
 	 */
 	@ColumnWidth(15)
 	@ExcelProperty("状态")
-	private Integer settleNoteStatus;
+	private String settleNoteStatus;
 
 }