From 911c8e1889185307d304854fcd3ef0d1210338f5 Mon Sep 17 00:00:00 2001 From: zch Date: Fri, 6 Jun 2025 18:08:51 +0800 Subject: [PATCH] =?UTF-8?q?refactor(os-ems):=20=E4=BC=98=E5=8C=96=20Excel?= =?UTF-8?q?=20=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为字符串类型的字段添加 cellType = Excel.ColumnType.STRING 注解 - 为数值类型的字段添加 cellType = Excel.ColumnType.NUMERIC 注解 - 优化部分字段的日期格式 --- .../os/ems/info/domain/DailyFaultRecord.java | 16 +++++----- .../ems/info/domain/FaultHandlingRecord.java | 14 ++++----- ...uggageSystemPlcBufferBatteryLifecycle.java | 12 ++++---- ...ageSystemSecurityDoorBatteryLifecycle.java | 12 ++++---- .../PowerEnergySparePartsRegistration.java | 14 ++++----- .../PowerEnergySupervisionChecklist.java | 30 +++++++++---------- .../ems/info/domain/SparePartsInventory.java | 16 +++++----- .../info/domain/SparePartsInventoryCheck.java | 7 ++--- .../domain/SparePartsInventoryExportVO.java | 19 ++++++------ .../info/domain/SparePartsUsageRecord.java | 20 ++++++------- .../ems/info/domain/UpsBatteryLifecycle.java | 16 +++++----- 11 files changed, 87 insertions(+), 89 deletions(-) diff --git a/os-ems/src/main/java/com/os/ems/info/domain/DailyFaultRecord.java b/os-ems/src/main/java/com/os/ems/info/domain/DailyFaultRecord.java index f91dab7..7d8b508 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/DailyFaultRecord.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/DailyFaultRecord.java @@ -23,27 +23,27 @@ public class DailyFaultRecord extends BaseEntity private String date; /** 位置 */ - @Excel(name = "位置") + @Excel(name = "位置" , cellType = Excel.ColumnType.STRING) private String location; /** 当日值班长 */ - @Excel(name = "当日值班长") + @Excel(name = "当日值班长" , cellType = Excel.ColumnType.STRING) private String dailyDutySupervisor; /** 天达当日值班长 */ - @Excel(name = "天达当日值班长") + @Excel(name = "天达当日值班长" , cellType = Excel.ColumnType.STRING) private String tendaDailyDutySupervisor; /** 故障情况 */ - @Excel(name = "故障情况") + @Excel(name = "故障情况" , cellType = Excel.ColumnType.STRING) private String faultSituation; /** 处置措施 */ - @Excel(name = "处置措施") + @Excel(name = "处置措施" , cellType = Excel.ColumnType.STRING) private String handlingMeasures; /** 故障类型 */ - @Excel(name = "故障类型") + @Excel(name = "故障类型" , cellType = Excel.ColumnType.STRING) private String faultType; /** 故障发生时间 */ @@ -54,8 +54,8 @@ public class DailyFaultRecord extends BaseEntity @Excel(name = "处置完毕时间" , dateFormat = "HH:mm:ss") private String handlingCompletionTime; - /** 处置时长 */ - @Excel(name = "处置时长") + /** 处置时长 */ + @Excel(name = "处置时长" , cellType = Excel.ColumnType.NUMERIC) private Long handlingDuration; public void setId(Long id) diff --git a/os-ems/src/main/java/com/os/ems/info/domain/FaultHandlingRecord.java b/os-ems/src/main/java/com/os/ems/info/domain/FaultHandlingRecord.java index 3787f67..a389936 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/FaultHandlingRecord.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/FaultHandlingRecord.java @@ -23,23 +23,23 @@ public class FaultHandlingRecord extends BaseEntity private String faultDate; /** 故障位置 */ - @Excel(name = "故障位置") + @Excel(name = "故障位置" , cellType = Excel.ColumnType.STRING) private String faultLocation; /** 处理人员 */ - @Excel(name = "处理人员") + @Excel(name = "处理人员" , cellType = Excel.ColumnType.STRING) private String handlingPersonnel; /** 故障现象及原因 */ - @Excel(name = "故障现象及原因") + @Excel(name = "故障现象及原因" , cellType = Excel.ColumnType.STRING) private String faultPhenomenonAndCause; /** 故障情况处置 */ - @Excel(name = "故障情况处置") + @Excel(name = "故障情况处置" , cellType = Excel.ColumnType.STRING) private String faultSituationHandling; /** 影响 */ - @Excel(name = "影响") + @Excel(name = "影响" , cellType = Excel.ColumnType.STRING) private String impact; /** 故障发生时间 */ @@ -47,11 +47,11 @@ public class FaultHandlingRecord extends BaseEntity private String faultOccurrenceTime; /** 处置时长 */ - @Excel(name = "处置时长") + @Excel(name = "处置时长" , cellType = Excel.ColumnType.NUMERIC ) private Long handlingDuration; /** 维修更换的主要元器件 */ - @Excel(name = "维修更换的主要元器件") + @Excel(name = "维修更换的主要元器件" , cellType = Excel.ColumnType.STRING ) private String mainComponentsRepaired; /** 备注 */ diff --git a/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemPlcBufferBatteryLifecycle.java b/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemPlcBufferBatteryLifecycle.java index 3f92584..35593fa 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemPlcBufferBatteryLifecycle.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemPlcBufferBatteryLifecycle.java @@ -19,23 +19,23 @@ public class LuggageSystemPlcBufferBatteryLifecycle extends BaseEntity private Long objid; /** 类型 */ - @Excel(name = "类型") + @Excel(name = "类型", cellType = Excel.ColumnType.STRING) private String type; /** 安装柜体名称 */ - @Excel(name = "安装柜体名称") + @Excel(name = "安装柜体名称", cellType = Excel.ColumnType.STRING) private String installationCabinetName; /** 位置描述 */ - @Excel(name = "位置描述") + @Excel(name = "位置描述", cellType = Excel.ColumnType.STRING) private String locationDescription; /** 来源 */ - @Excel(name = "来源") + @Excel(name = "来源", cellType = Excel.ColumnType.STRING) private String source; /** 取电 */ - @Excel(name = "取电") + @Excel(name = "取电", cellType = Excel.ColumnType.STRING) private String powerSource; /** 图片地址 */ @@ -43,7 +43,7 @@ public class LuggageSystemPlcBufferBatteryLifecycle extends BaseEntity private String imageAddress; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "备注", cellType = Excel.ColumnType.STRING) private String remarks; /** 第1次 */ diff --git a/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemSecurityDoorBatteryLifecycle.java b/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemSecurityDoorBatteryLifecycle.java index a50989d..1a01220 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemSecurityDoorBatteryLifecycle.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemSecurityDoorBatteryLifecycle.java @@ -19,23 +19,23 @@ public class LuggageSystemSecurityDoorBatteryLifecycle extends BaseEntity private Long objid; /** 类型 */ - @Excel(name = "类型") + @Excel(name = "类型" , cellType = Excel.ColumnType.STRING) private String type; /** 参照位置 */ - @Excel(name = "参照位置") + @Excel(name = "参照位置", cellType = Excel.ColumnType.STRING) private String referenceLocation; /** 位置描述 */ - @Excel(name = "位置描述") + @Excel(name = "位置描述", cellType = Excel.ColumnType.STRING) private String locationDescription; /** 取电 */ - @Excel(name = "取电") + @Excel(name = "取电", cellType = Excel.ColumnType.STRING) private String powerSource; /** 电池类型 */ - @Excel(name = "电池类型") + @Excel(name = "电池类型", cellType = Excel.ColumnType.STRING) private String batteryType; /** 图片地址 */ @@ -43,7 +43,7 @@ public class LuggageSystemSecurityDoorBatteryLifecycle extends BaseEntity private String imageAddress; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "备注", cellType = Excel.ColumnType.STRING) private String remarks; /** 第1次 */ diff --git a/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySparePartsRegistration.java b/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySparePartsRegistration.java index b82d65a..7569533 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySparePartsRegistration.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySparePartsRegistration.java @@ -23,31 +23,31 @@ public class PowerEnergySparePartsRegistration extends BaseEntity private String date; /** 备件名称 */ - @Excel(name = "备件名称") + @Excel(name = "备件名称", cellType = Excel.ColumnType.STRING) private String sparePartsName; /** 备件型号 */ - @Excel(name = "备件型号") + @Excel(name = "备件型号", cellType = Excel.ColumnType.STRING) private String sparePartModel; /** 废存数量 */ - @Excel(name = "废存数量") + @Excel(name = "废存数量", cellType = Excel.ColumnType.NUMERIC) private Long wasteQuantity; /** 存放位置 */ - @Excel(name = "存放位置") + @Excel(name = "存放位置", cellType = Excel.ColumnType.STRING) private String storageLocation; /** 登记人 */ - @Excel(name = "登记人") + @Excel(name = "登记人", cellType = Excel.ColumnType.STRING) private String registrar; /** 库管确认 */ - @Excel(name = "库管确认") + @Excel(name = "库管确认", cellType = Excel.ColumnType.STRING) private String warehouseConfirmation; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "备注", cellType = Excel.ColumnType.STRING) private String remarks; public void setObjid(Long objid) diff --git a/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySupervisionChecklist.java b/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySupervisionChecklist.java index e100ca1..9447f0e 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySupervisionChecklist.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySupervisionChecklist.java @@ -23,63 +23,63 @@ public class PowerEnergySupervisionChecklist extends BaseEntity private String date; /** 作业类别 */ - @Excel(name = "作业类别") + @Excel(name = "作业类别", cellType = Excel.ColumnType.STRING) private String jobCategory; /** 作业单位 */ - @Excel(name = "作业单位") + @Excel(name = "作业单位", cellType = Excel.ColumnType.STRING) private String jobUnit; /** 作业名称 */ - @Excel(name = "作业名称") + @Excel(name = "作业名称", cellType = Excel.ColumnType.STRING) private String jobName; /** 作业风险 */ - @Excel(name = "作业风险") + @Excel(name = "作业风险", cellType = Excel.ColumnType.STRING) private String jobRisk; /** 风险管控措施 */ - @Excel(name = "风险管控措施") + @Excel(name = "风险管控措施", cellType = Excel.ColumnType.STRING) private String riskControlMeasures; /** 监督检查层级 */ - @Excel(name = "监督检查层级") + @Excel(name = "监督检查层级", cellType = Excel.ColumnType.STRING) private String supervisionLevel; /** 监督检查落实情况 */ - @Excel(name = "监督检查落实情况") + @Excel(name = "监督检查落实情况", cellType = Excel.ColumnType.STRING) private String supervisionImplementation; /** 作业科室 */ - @Excel(name = "作业科室") + @Excel(name = "作业科室", cellType = Excel.ColumnType.STRING) private String jobDepartment; /** 监管人员 */ - @Excel(name = "监管人员") + @Excel(name = "监管人员", cellType = Excel.ColumnType.STRING) private String regulatoryPersonnel; /** 检查人员 */ - @Excel(name = "检查人员") + @Excel(name = "检查人员", cellType = Excel.ColumnType.STRING) private String inspectionPersonnel; /** 检查出的问题 */ - @Excel(name = "检查出的问题") + @Excel(name = "检查出的问题", cellType = Excel.ColumnType.STRING) private String problemsFound; /** 外包单位责任人 */ - @Excel(name = "外包单位责任人") + @Excel(name = "外包单位责任人", cellType = Excel.ColumnType.STRING) private String outsourcingUnitResponsiblePerson; /** 工单变更内容 */ - @Excel(name = "工单变更内容") + @Excel(name = "工单变更内容", cellType = Excel.ColumnType.STRING) private String workOrderChangeContent; /** 本工单是否闭环 */ - @Excel(name = "本工单是否闭环") + @Excel(name = "本工单是否闭环", cellType = Excel.ColumnType.STRING) private String isWorkOrderClosedLoop; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "备注", cellType = Excel.ColumnType.STRING) private String remarks; public void setId(Long id) diff --git a/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventory.java b/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventory.java index 440bebb..720ff71 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventory.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventory.java @@ -23,35 +23,35 @@ public class SparePartsInventory extends BaseEntity private String warehouseDate; /** 采购方式 */ - @Excel(name = "采购方式") + @Excel(name = "采购方式", cellType = Excel.ColumnType.STRING) private String purchaseMethod; /** 库存位置 */ - @Excel(name = "库存位置") + @Excel(name = "库存位置", cellType = Excel.ColumnType.STRING) private String storageLocation; /** 物品名称 */ - @Excel(name = "物品名称") + @Excel(name = "物品名称", cellType = Excel.ColumnType.STRING) private String itemName; /** 原厂编号 */ - @Excel(name = "原厂编号") + @Excel(name = "原厂编号", cellType = Excel.ColumnType.STRING) private String originalPartNumber; /** 型号 */ - @Excel(name = "型号") + @Excel(name = "型号", cellType = Excel.ColumnType.STRING) private String model; /** 入库数量 */ - @Excel(name = "入库数量") + @Excel(name = "入库数量", cellType = Excel.ColumnType.NUMERIC) private Long warehouseQuantity; /** 剩余数量 */ - @Excel(name = "剩余数量") + @Excel(name = "剩余数量", cellType = Excel.ColumnType.NUMERIC) private Long remainingQuantity; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "备注", cellType = Excel.ColumnType.STRING) private String remarks; public void setObjid(Long objid) diff --git a/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventoryCheck.java b/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventoryCheck.java index 40cf8e1..a2d2b66 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventoryCheck.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventoryCheck.java @@ -19,19 +19,18 @@ public class SparePartsInventoryCheck extends BaseEntity private Long id; /** 备件库存主表ID */ - @Excel(name = "备件库存主表ID") private Long inventoryObjid; /** 盘点名称 */ - @Excel(name = "盘点名称") + @Excel(name = "盘点名称", cellType = Excel.ColumnType.STRING) private String checkName; /** 盘点数量 */ - @Excel(name = "盘点数量") + @Excel(name = "盘点数量", cellType = Excel.ColumnType.NUMERIC) private Long checkQuantity; /** 盘点日期 */ - @Excel(name = "盘点日期") + @Excel(name = "盘点日期", cellType = Excel.ColumnType.STRING) private String checkDate; public void setId(Long id) diff --git a/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventoryExportVO.java b/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventoryExportVO.java index e85d62c..db06536 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventoryExportVO.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventoryExportVO.java @@ -18,43 +18,42 @@ public class SparePartsInventoryExportVO private static final long serialVersionUID = 1L; /** 主键 */ - @Excel(name = "主键") private Long objid; /** 入库时间 */ - @Excel(name = "入库时间") + @Excel(name = "入库时间" , dateFormat = "yyyy/MM/dd") private String warehouseDate; /** 采购方式 */ - @Excel(name = "采购方式") + @Excel(name = "采购方式", cellType = Excel.ColumnType.STRING) private String purchaseMethod; /** 库存位置 */ - @Excel(name = "库存位置") + @Excel(name = "库存位置", cellType = Excel.ColumnType.STRING) private String storageLocation; /** 物品名称 */ - @Excel(name = "物品名称") + @Excel(name = "物品名称", cellType = Excel.ColumnType.STRING) private String itemName; /** 原厂编号 */ - @Excel(name = "原厂编号") + @Excel(name = "原厂编号", cellType = Excel.ColumnType.STRING) private String originalPartNumber; /** 型号 */ - @Excel(name = "型号") + @Excel(name = "型号", cellType = Excel.ColumnType.STRING) private String model; /** 入库数量 */ - @Excel(name = "入库数量") + @Excel(name = "入库数量", cellType = Excel.ColumnType.NUMERIC) private Long warehouseQuantity; /** 剩余数量 */ - @Excel(name = "剩余数量") + @Excel(name = "剩余数量", cellType = Excel.ColumnType.NUMERIC) private Long remainingQuantity; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "备注", cellType = Excel.ColumnType.STRING) private String remarks; /** 动态盘点数据 - 用于存储各种盘点列的值 */ diff --git a/os-ems/src/main/java/com/os/ems/info/domain/SparePartsUsageRecord.java b/os-ems/src/main/java/com/os/ems/info/domain/SparePartsUsageRecord.java index 006b01c..2c8a860 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/SparePartsUsageRecord.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/SparePartsUsageRecord.java @@ -23,43 +23,43 @@ public class SparePartsUsageRecord extends BaseEntity private String date; /** 备件名称 */ - @Excel(name = "备件名称") + @Excel(name = "备件名称", cellType = Excel.ColumnType.STRING) private String sparePartName; /** 备件型号 */ - @Excel(name = "备件型号") + @Excel(name = "备件型号", cellType = Excel.ColumnType.STRING) private String sparePartModel; /** 使用数量 */ - @Excel(name = "使用数量") + @Excel(name = "使用数量", cellType = Excel.ColumnType.NUMERIC) private Long quantityUsed; /** 剩余数量 */ - @Excel(name = "剩余数量") + @Excel(name = "剩余数量", cellType = Excel.ColumnType.NUMERIC) private Long remainingQuantity; /** 领用库房 */ - @Excel(name = "领用库房") + @Excel(name = "领用库房", cellType = Excel.ColumnType.STRING) private String issuingWarehouse; /** 更换位置 */ - @Excel(name = "更换位置") + @Excel(name = "更换位置", cellType = Excel.ColumnType.STRING) private String replacementLocation; /** 领用人 */ - @Excel(name = "领用人") + @Excel(name = "领用人", cellType = Excel.ColumnType.STRING) private String personReceived; /** 库管确认人 */ - @Excel(name = "库管确认人") + @Excel(name = "库管确认人", cellType = Excel.ColumnType.STRING) private String warehouseManagerConfirmation; /** 库存表状态 */ - @Excel(name = "库存表状态") + @Excel(name = "库存表状态", cellType = Excel.ColumnType.STRING) private String inventoryStatus; /** 部门仓库 */ - @Excel(name = "部门仓库") + @Excel(name = "部门仓库", cellType = Excel.ColumnType.STRING) private String departmentWarehouse; public void setId(Long id) diff --git a/os-ems/src/main/java/com/os/ems/info/domain/UpsBatteryLifecycle.java b/os-ems/src/main/java/com/os/ems/info/domain/UpsBatteryLifecycle.java index 06e6c5a..bbb8947 100644 --- a/os-ems/src/main/java/com/os/ems/info/domain/UpsBatteryLifecycle.java +++ b/os-ems/src/main/java/com/os/ems/info/domain/UpsBatteryLifecycle.java @@ -19,35 +19,35 @@ public class UpsBatteryLifecycle extends BaseEntity private Long id; /** 类型 */ - @Excel(name = "类型") + @Excel(name = "类型", cellType = Excel.ColumnType.STRING) private String type; /** UPS安装柜体名称 */ - @Excel(name = "UPS安装柜体名称") + @Excel(name = "UPS安装柜体名称", cellType = Excel.ColumnType.STRING) private String upsInstallationCabinetName; /** 参照位置 */ - @Excel(name = "参照位置") + @Excel(name = "参照位置", cellType = Excel.ColumnType.STRING) private String referenceLocation; /** 位置描述 */ - @Excel(name = "位置描述") + @Excel(name = "位置描述", cellType = Excel.ColumnType.STRING) private String locationDescription; /** 现UPS来源 */ - @Excel(name = "现UPS来源") + @Excel(name = "现UPS来源", cellType = Excel.ColumnType.STRING) private String currentUps; /** 取电 */ - @Excel(name = "取电") + @Excel(name = "取电", cellType = Excel.ColumnType.STRING) private String powerSource; /** 涉及区域 */ - @Excel(name = "涉及区域") + @Excel(name = "涉及区域", cellType = Excel.ColumnType.STRING) private String affectedArea; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "备注", cellType = Excel.ColumnType.STRING) private String remarks; /** 第1次 */