From 4c33acfe648e9b008f91c5e2cf446550e6b0174d Mon Sep 17 00:00:00 2001 From: liding <756868258@qq.com> Date: 星期二, 22 七月 2025 17:35:57 +0800 Subject: [PATCH] 1.正式库导出优化 2.销售导出 3.设备使用状态优化 4.定时任务优化 --- main-business/src/main/java/com/ruoyi/business/dto/OfficialInventoryDto.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/main-business/src/main/java/com/ruoyi/business/dto/OfficialInventoryDto.java b/main-business/src/main/java/com/ruoyi/business/dto/OfficialInventoryDto.java index 066257f..4bc29b1 100644 --- a/main-business/src/main/java/com/ruoyi/business/dto/OfficialInventoryDto.java +++ b/main-business/src/main/java/com/ruoyi/business/dto/OfficialInventoryDto.java @@ -1,5 +1,6 @@ package com.ruoyi.business.dto; +import com.ruoyi.basic.entity.CoalValue; import com.ruoyi.business.entity.OfficialInventory; import lombok.Data; @@ -9,8 +10,21 @@ @Data public class OfficialInventoryDto extends OfficialInventory { - private List<Map<String, String>> fields; + private List<Map<String, String>> fields;//鏌ヨ杩斿洖鐨勭叅绉嶄俊鎭敭鍊煎 - private List<Long> ids; + private List<Long> ids;//瑕佸悎骞剁殑姝e紡搴撶殑id + + private String coal; //鐓ょ + + private String supplierName; //渚涘簲鍟� + + private String registrant; //鐧昏浜� + + private String supplierCoal; //渚涘簲鍟� + 鐓ょ + + private List<Map<String, String>> coalValues; //濯掕川鏂规瀛楁鍊� + + private List<Long> exportIds;//瀵煎嚭閫変腑鐨刬d + } -- Gitblit v1.9.3