应付明细11

yd-csf-service/src/main/java/com/yd/csf/service/vo/ExpectedFortuneExportDTO.java

@@ -8,6 +8,7 @@ import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.yd.csf.feign.response.expectedfortune.ApiExpectedFortunePageResponse;
 import com.yd.csf.service.enums.FortuneStatusEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -59,13 +60,13 @@ public class ExpectedFortuneExportDTO {
     @ExcelProperty("出账项目")
     private String fortuneName;
 
-    @ExcelProperty("出账日（估）")
-    @DateTimeFormat("yyyy-MM-dd")
+    @ExcelProperty("出账年月（估）")
+    @DateTimeFormat("yyyy-MM")
     @ColumnWidth(25)
     private Date payoutDate;
 
-    @ExcelProperty("出账日（实）")
-    @DateTimeFormat("yyyy-MM-dd")
+    @ExcelProperty("出账年月（实）")
+    @DateTimeFormat("yyyy-MM")
     @ColumnWidth(25)
     private Date actualPayoutDate;
 
@@ -115,6 +116,9 @@ public class ExpectedFortuneExportDTO {
     @ColumnWidth(30)
     private String remark;
 
+    @ExcelProperty("创建人")
+    private String creatorName;
+
     @ExcelProperty("创建时间")
     @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
     @ColumnWidth(25)
@@ -159,6 +163,7 @@ public class ExpectedFortuneExportDTO {
         dto.setUnpaidRuleAmount(vo.getUnpaidRuleAmount());
         dto.setUnpaidRuleAmounthHkd(vo.getUnpaidRuleAmounthHkd());
         dto.setRemark(vo.getRemark());
+        dto.setCreatorName(vo.getCreatorName());
         dto.setBrokerGradeName(vo.getBrokerGradeName());
         return dto;
     }