From dcd1aab9b5bec2556161c16bd1bc4fe71fef476d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 08 六月 2026 17:17:47 +0800
Subject: [PATCH] 关于社保补缴的计算,如果社保保险设置有多条数据,根据创建时间来判断,当月即以后得参考标准用对应的配置,并且需要统计当年从1月到现在缴纳的所有社保金额,和最新的社保比列得出的金额进行比较,计算需要补缴的金额,只有社会保险设置新增一条数据的当月会计算,其余月份对应的都是0

---
 src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
index 0614da2..809e4e6 100644
--- a/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
+++ b/src/main/java/com/ruoyi/device/execl/DeviceMaintenanceExeclDto.java
@@ -21,6 +21,10 @@
     @Schema(description = "瑙勬牸鍨嬪彿")
     private String deviceModel;
 
+    @Schema(description = "椤圭洰")
+    @Excel(name = "椤圭洰")
+    private String machineryCategory;
+
     @Excel(name = "璁″垝淇濆吇鏃ユ湡", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
     @Schema(description = "璁″垝淇濆吇鏃ユ湡")
     private Date maintenancePlanTime;

--
Gitblit v1.9.3