From edc7172b312e0aec94362b651e2f7145e0c357fe Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 16 一月 2025 17:04:10 +0800
Subject: [PATCH] 核算导出调整+osd测试脚本

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java |   32 +++++++++++++-------------------
 1 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
index bd6aca7..a1bd3df 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java
@@ -27,8 +27,14 @@
      * 瑙勫垯鍚嶇О
      */
     @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "瑙勫垯鍚嶇О"})
-    @ColumnWidth(40)
+    @ColumnWidth(130)
     private String ruleName;
+    /**
+     * 缁嗗垯
+     */
+    @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "缁嗗垯"})
+    @ColumnWidth(130)
+    private String detailName;
 
     /**
      * 鏁伴噺
@@ -37,27 +43,15 @@
     private Integer num;
 
     /**
+     * 鍒嗘暟
+     */
+    @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "鍒嗘暟"})
+    private BigDecimal score;
+
+    /**
      * 閲戦
      */
     @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "閲戦"})
     private BigDecimal money;
-
-    /**
-     * 鍒嗘暟
-     */
-    @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "鍒嗘暟"})
-    private Integer score;
-
-    /**
-     * 鍓╀綑鍒嗘暟
-     */
-    @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "鍓╀綑鍒嗘暟"})
-    private Integer surplusScore;
-
-    /**
-     * 鍚堣
-     */
-    @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "鍚堣"})
-    private BigDecimal total;
 
 }

--
Gitblit v1.8.0