From ee03b526152d335dd1e42bc01a1f717d1205204c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 26 五月 2025 15:27:04 +0800
Subject: [PATCH] （部级录像可用率，重点录像可用率，录像可用率）计算可用率bug修复，hk接口bug修复，
---
ycl-pojo/src/main/java/com/ycl/platform/domain/excel/CalculateExport.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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..e8b6847 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
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.excel;
+import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.*;
import com.alibaba.excel.enums.BooleanEnum;
@@ -27,8 +28,14 @@
* 瑙勫垯鍚嶇О
*/
@ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "瑙勫垯鍚嶇О"})
- @ColumnWidth(40)
+ @ColumnWidth(130)
private String ruleName;
+ /**
+ * 缁嗗垯
+ */
+ @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "缁嗗垯"})
+ @ColumnWidth(130)
+ private String detailName;
/**
* 鏁伴噺
@@ -37,27 +44,20 @@
private Integer num;
/**
+ * 鍒嗘暟
+ */
+ @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "鍒嗘暟"})
+ private BigDecimal score;
+
+ /**
* 閲戦
*/
@ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "閲戦"})
private BigDecimal money;
/**
- * 鍒嗘暟
+ * 鎵ｉ櫎鍒嗘暟
*/
- @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "鍒嗘暟"})
- private Integer score;
-
- /**
- * 鍓╀綑鍒嗘暟
- */
- @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "鍓╀綑鍒嗘暟"})
- private Integer surplusScore;
-
- /**
- * 鍚堣
- */
- @ExcelProperty({"鑷础甯傚叕鍏辫棰戠洃鎺х郴缁熺画缁村悎鍚�", "鍚堣"})
- private BigDecimal total;
-
+ @ExcelIgnore
+ private BigDecimal calcFraction;
}
--
Gitblit v1.8.0