zangch
/
JDAirPort.Ems.Back
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(os-ems): 优化 Excel 导出字段类型

Browse Source 
- 为字符串类型的字段添加 cellType = Excel.ColumnType.STRING 注解
- 为数值类型的字段添加 cellType = Excel.ColumnType.NUMERIC 注解
- 优化部分字段的日期格式
boardTest
zch 1 month ago
parent f73334995d
commit 911c8e1889
11 changed files with 87 additions and 89 deletions
Show Stats Download Patch File Download Diff File

16
os-ems/src/main/java/com/os/ems/info/domain/DailyFaultRecord.java
Unescape Escape View File

@ -23,27 +23,27 @@ public class DailyFaultRecord extends BaseEntity
private String date; private String date;
/** 位置 */ /** 位置 */
@Excel(name = "位置") @Excel(name = "位置" , cellType = Excel.ColumnType.STRING)
private String location; private String location;
/** 当日值班长 */ /** 当日值班长 */
@Excel(name = "当日值班长") @Excel(name = "当日值班长" , cellType = Excel.ColumnType.STRING)
private String dailyDutySupervisor; private String dailyDutySupervisor;
/** 天达当日值班长 */ /** 天达当日值班长 */
@Excel(name = "天达当日值班长") @Excel(name = "天达当日值班长" , cellType = Excel.ColumnType.STRING)
private String tendaDailyDutySupervisor; private String tendaDailyDutySupervisor;
/** 故障情况 */ /** 故障情况 */
@Excel(name = "故障情况") @Excel(name = "故障情况" , cellType = Excel.ColumnType.STRING)
private String faultSituation; private String faultSituation;
/** 处置措施 */ /** 处置措施 */
@Excel(name = "处置措施") @Excel(name = "处置措施" , cellType = Excel.ColumnType.STRING)
private String handlingMeasures; private String handlingMeasures;
/** 故障类型 */ /** 故障类型 */
@Excel(name = "故障类型") @Excel(name = "故障类型" , cellType = Excel.ColumnType.STRING)
private String faultType; private String faultType;
/** 故障发生时间 */ /** 故障发生时间 */
@ -54,8 +54,8 @@ public class DailyFaultRecord extends BaseEntity
@Excel(name = "处置完毕时间" , dateFormat = "HH:mm:ss") @Excel(name = "处置完毕时间" , dateFormat = "HH:mm:ss")
private String handlingCompletionTime; private String handlingCompletionTime;
/** 处置时长 */ /** 处置时长 */
@Excel(name = "处置时长") @Excel(name = "处置时长" , cellType = Excel.ColumnType.NUMERIC)
private Long handlingDuration; private Long handlingDuration;
public void setId(Long id) public void setId(Long id)

14
os-ems/src/main/java/com/os/ems/info/domain/FaultHandlingRecord.java
Unescape Escape View File

@ -23,23 +23,23 @@ public class FaultHandlingRecord extends BaseEntity
private String faultDate; private String faultDate;
/** 故障位置 */ /** 故障位置 */
@Excel(name = "故障位置") @Excel(name = "故障位置" , cellType = Excel.ColumnType.STRING)
private String faultLocation; private String faultLocation;
/** 处理人员 */ /** 处理人员 */
@Excel(name = "处理人员") @Excel(name = "处理人员" , cellType = Excel.ColumnType.STRING)
private String handlingPersonnel; private String handlingPersonnel;
/** 故障现象及原因 */ /** 故障现象及原因 */
@Excel(name = "故障现象及原因") @Excel(name = "故障现象及原因" , cellType = Excel.ColumnType.STRING)
private String faultPhenomenonAndCause; private String faultPhenomenonAndCause;
/** 故障情况处置 */ /** 故障情况处置 */
@Excel(name = "故障情况处置") @Excel(name = "故障情况处置" , cellType = Excel.ColumnType.STRING)
private String faultSituationHandling; private String faultSituationHandling;
/** 影响 */ /** 影响 */
@Excel(name = "影响") @Excel(name = "影响" , cellType = Excel.ColumnType.STRING)
private String impact; private String impact;
/** 故障发生时间 */ /** 故障发生时间 */
@ -47,11 +47,11 @@ public class FaultHandlingRecord extends BaseEntity
private String faultOccurrenceTime; private String faultOccurrenceTime;
/** 处置时长 */ /** 处置时长 */
@Excel(name = "处置时长") @Excel(name = "处置时长" , cellType = Excel.ColumnType.NUMERIC )
private Long handlingDuration; private Long handlingDuration;
/** 维修更换的主要元器件 */ /** 维修更换的主要元器件 */
@Excel(name = "维修更换的主要元器件") @Excel(name = "维修更换的主要元器件" , cellType = Excel.ColumnType.STRING )
private String mainComponentsRepaired; private String mainComponentsRepaired;
/** 备注 */ /** 备注 */

12
os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemPlcBufferBatteryLifecycle.java
Unescape Escape View File

@ -19,23 +19,23 @@ public class LuggageSystemPlcBufferBatteryLifecycle extends BaseEntity
private Long objid; private Long objid;
/** 类型 */ /** 类型 */
@Excel(name = "类型") @Excel(name = "类型", cellType = Excel.ColumnType.STRING)
private String type; private String type;
/** 安装柜体名称 */ /** 安装柜体名称 */
@Excel(name = "安装柜体名称") @Excel(name = "安装柜体名称", cellType = Excel.ColumnType.STRING)
private String installationCabinetName; private String installationCabinetName;
/** 位置描述 */ /** 位置描述 */
@Excel(name = "位置描述") @Excel(name = "位置描述", cellType = Excel.ColumnType.STRING)
private String locationDescription; private String locationDescription;
/** 来源 */ /** 来源 */
@Excel(name = "来源") @Excel(name = "来源", cellType = Excel.ColumnType.STRING)
private String source; private String source;
/** 取电 */ /** 取电 */
@Excel(name = "取电") @Excel(name = "取电", cellType = Excel.ColumnType.STRING)
private String powerSource; private String powerSource;
/** 图片地址 */ /** 图片地址 */
@ -43,7 +43,7 @@ public class LuggageSystemPlcBufferBatteryLifecycle extends BaseEntity
private String imageAddress; private String imageAddress;
/** 备注 */ /** 备注 */
@Excel(name = "备注") @Excel(name = "备注", cellType = Excel.ColumnType.STRING)
private String remarks; private String remarks;
/** 第1次 */ /** 第1次 */

12
os-ems/src/main/java/com/os/ems/info/domain/LuggageSystemSecurityDoorBatteryLifecycle.java
Unescape Escape View File

@ -19,23 +19,23 @@ public class LuggageSystemSecurityDoorBatteryLifecycle extends BaseEntity
private Long objid; private Long objid;
/** 类型 */ /** 类型 */
@Excel(name = "类型") @Excel(name = "类型" , cellType = Excel.ColumnType.STRING)
private String type; private String type;
/** 参照位置 */ /** 参照位置 */
@Excel(name = "参照位置") @Excel(name = "参照位置", cellType = Excel.ColumnType.STRING)
private String referenceLocation; private String referenceLocation;
/** 位置描述 */ /** 位置描述 */
@Excel(name = "位置描述") @Excel(name = "位置描述", cellType = Excel.ColumnType.STRING)
private String locationDescription; private String locationDescription;
/** 取电 */ /** 取电 */
@Excel(name = "取电") @Excel(name = "取电", cellType = Excel.ColumnType.STRING)
private String powerSource; private String powerSource;
/** 电池类型 */ /** 电池类型 */
@Excel(name = "电池类型") @Excel(name = "电池类型", cellType = Excel.ColumnType.STRING)
private String batteryType; private String batteryType;
/** 图片地址 */ /** 图片地址 */
@ -43,7 +43,7 @@ public class LuggageSystemSecurityDoorBatteryLifecycle extends BaseEntity
private String imageAddress; private String imageAddress;
/** 备注 */ /** 备注 */
@Excel(name = "备注") @Excel(name = "备注", cellType = Excel.ColumnType.STRING)
private String remarks; private String remarks;
/** 第1次 */ /** 第1次 */

14
os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySparePartsRegistration.java
Unescape Escape View File

@ -23,31 +23,31 @@ public class PowerEnergySparePartsRegistration extends BaseEntity
private String date; private String date;
/** 备件名称 */ /** 备件名称 */
@Excel(name = "备件名称") @Excel(name = "备件名称", cellType = Excel.ColumnType.STRING)
private String sparePartsName; private String sparePartsName;
/** 备件型号 */ /** 备件型号 */
@Excel(name = "备件型号") @Excel(name = "备件型号", cellType = Excel.ColumnType.STRING)
private String sparePartModel; private String sparePartModel;
/** 废存数量 */ /** 废存数量 */
@Excel(name = "废存数量") @Excel(name = "废存数量", cellType = Excel.ColumnType.NUMERIC)
private Long wasteQuantity; private Long wasteQuantity;
/** 存放位置 */ /** 存放位置 */
@Excel(name = "存放位置") @Excel(name = "存放位置", cellType = Excel.ColumnType.STRING)
private String storageLocation; private String storageLocation;
/** 登记人 */ /** 登记人 */
@Excel(name = "登记人") @Excel(name = "登记人", cellType = Excel.ColumnType.STRING)
private String registrar; private String registrar;
/** 库管确认 */ /** 库管确认 */
@Excel(name = "库管确认") @Excel(name = "库管确认", cellType = Excel.ColumnType.STRING)
private String warehouseConfirmation; private String warehouseConfirmation;
/** 备注 */ /** 备注 */
@Excel(name = "备注") @Excel(name = "备注", cellType = Excel.ColumnType.STRING)
private String remarks; private String remarks;
public void setObjid(Long objid) public void setObjid(Long objid)

30
os-ems/src/main/java/com/os/ems/info/domain/PowerEnergySupervisionChecklist.java
Unescape Escape View File

@ -23,63 +23,63 @@ public class PowerEnergySupervisionChecklist extends BaseEntity
private String date; private String date;
/** 作业类别 */ /** 作业类别 */
@Excel(name = "作业类别") @Excel(name = "作业类别", cellType = Excel.ColumnType.STRING)
private String jobCategory; private String jobCategory;
/** 作业单位 */ /** 作业单位 */
@Excel(name = "作业单位") @Excel(name = "作业单位", cellType = Excel.ColumnType.STRING)
private String jobUnit; private String jobUnit;
/** 作业名称 */ /** 作业名称 */
@Excel(name = "作业名称") @Excel(name = "作业名称", cellType = Excel.ColumnType.STRING)
private String jobName; private String jobName;
/** 作业风险 */ /** 作业风险 */
@Excel(name = "作业风险") @Excel(name = "作业风险", cellType = Excel.ColumnType.STRING)
private String jobRisk; private String jobRisk;
/** 风险管控措施 */ /** 风险管控措施 */
@Excel(name = "风险管控措施") @Excel(name = "风险管控措施", cellType = Excel.ColumnType.STRING)
private String riskControlMeasures; private String riskControlMeasures;
/** 监督检查层级 */ /** 监督检查层级 */
@Excel(name = "监督检查层级") @Excel(name = "监督检查层级", cellType = Excel.ColumnType.STRING)
private String supervisionLevel; private String supervisionLevel;
/** 监督检查落实情况 */ /** 监督检查落实情况 */
@Excel(name = "监督检查落实情况") @Excel(name = "监督检查落实情况", cellType = Excel.ColumnType.STRING)
private String supervisionImplementation; private String supervisionImplementation;
/** 作业科室 */ /** 作业科室 */
@Excel(name = "作业科室") @Excel(name = "作业科室", cellType = Excel.ColumnType.STRING)
private String jobDepartment; private String jobDepartment;
/** 监管人员 */ /** 监管人员 */
@Excel(name = "监管人员") @Excel(name = "监管人员", cellType = Excel.ColumnType.STRING)
private String regulatoryPersonnel; private String regulatoryPersonnel;
/** 检查人员 */ /** 检查人员 */
@Excel(name = "检查人员") @Excel(name = "检查人员", cellType = Excel.ColumnType.STRING)
private String inspectionPersonnel; private String inspectionPersonnel;
/** 检查出的问题 */ /** 检查出的问题 */
@Excel(name = "检查出的问题") @Excel(name = "检查出的问题", cellType = Excel.ColumnType.STRING)
private String problemsFound; private String problemsFound;
/** 外包单位责任人 */ /** 外包单位责任人 */
@Excel(name = "外包单位责任人") @Excel(name = "外包单位责任人", cellType = Excel.ColumnType.STRING)
private String outsourcingUnitResponsiblePerson; private String outsourcingUnitResponsiblePerson;
/** 工单变更内容 */ /** 工单变更内容 */
@Excel(name = "工单变更内容") @Excel(name = "工单变更内容", cellType = Excel.ColumnType.STRING)
private String workOrderChangeContent; private String workOrderChangeContent;
/** 本工单是否闭环 */ /** 本工单是否闭环 */
@Excel(name = "本工单是否闭环") @Excel(name = "本工单是否闭环", cellType = Excel.ColumnType.STRING)
private String isWorkOrderClosedLoop; private String isWorkOrderClosedLoop;
/** 备注 */ /** 备注 */
@Excel(name = "备注") @Excel(name = "备注", cellType = Excel.ColumnType.STRING)
private String remarks; private String remarks;
public void setId(Long id) public void setId(Long id)

16
os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventory.java
Unescape Escape View File

@ -23,35 +23,35 @@ public class SparePartsInventory extends BaseEntity
private String warehouseDate; private String warehouseDate;
/** 采购方式 */ /** 采购方式 */
@Excel(name = "采购方式") @Excel(name = "采购方式", cellType = Excel.ColumnType.STRING)
private String purchaseMethod; private String purchaseMethod;
/** 库存位置 */ /** 库存位置 */
@Excel(name = "库存位置") @Excel(name = "库存位置", cellType = Excel.ColumnType.STRING)
private String storageLocation; private String storageLocation;
/** 物品名称 */ /** 物品名称 */
@Excel(name = "物品名称") @Excel(name = "物品名称", cellType = Excel.ColumnType.STRING)
private String itemName; private String itemName;
/** 原厂编号 */ /** 原厂编号 */
@Excel(name = "原厂编号") @Excel(name = "原厂编号", cellType = Excel.ColumnType.STRING)
private String originalPartNumber; private String originalPartNumber;
/** 型号 */ /** 型号 */
@Excel(name = "型号") @Excel(name = "型号", cellType = Excel.ColumnType.STRING)
private String model; private String model;
/** 入库数量 */ /** 入库数量 */
@Excel(name = "入库数量") @Excel(name = "入库数量", cellType = Excel.ColumnType.NUMERIC)
private Long warehouseQuantity; private Long warehouseQuantity;
/** 剩余数量 */ /** 剩余数量 */
@Excel(name = "剩余数量") @Excel(name = "剩余数量", cellType = Excel.ColumnType.NUMERIC)
private Long remainingQuantity; private Long remainingQuantity;
/** 备注 */ /** 备注 */
@Excel(name = "备注") @Excel(name = "备注", cellType = Excel.ColumnType.STRING)
private String remarks; private String remarks;
public void setObjid(Long objid) public void setObjid(Long objid)

7
os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventoryCheck.java
Unescape Escape View File

@ -19,19 +19,18 @@ public class SparePartsInventoryCheck extends BaseEntity
private Long id; private Long id;
/** 备件库存主表ID */ /** 备件库存主表ID */
@Excel(name = "备件库存主表ID")
private Long inventoryObjid; private Long inventoryObjid;
/** 盘点名称 */ /** 盘点名称 */
@Excel(name = "盘点名称") @Excel(name = "盘点名称", cellType = Excel.ColumnType.STRING)
private String checkName; private String checkName;
/** 盘点数量 */ /** 盘点数量 */
@Excel(name = "盘点数量") @Excel(name = "盘点数量", cellType = Excel.ColumnType.NUMERIC)
private Long checkQuantity; private Long checkQuantity;
/** 盘点日期 */ /** 盘点日期 */
@Excel(name = "盘点日期") @Excel(name = "盘点日期", cellType = Excel.ColumnType.STRING)
private String checkDate; private String checkDate;
public void setId(Long id) public void setId(Long id)

19
os-ems/src/main/java/com/os/ems/info/domain/SparePartsInventoryExportVO.java
Unescape Escape View File

@ -18,43 +18,42 @@ public class SparePartsInventoryExportVO
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键 */ /** 主键 */
@Excel(name = "主键")
private Long objid; private Long objid;
/** 入库时间 */ /** 入库时间 */
@Excel(name = "入库时间") @Excel(name = "入库时间" , dateFormat = "yyyy/MM/dd")
private String warehouseDate; private String warehouseDate;
/** 采购方式 */ /** 采购方式 */
@Excel(name = "采购方式") @Excel(name = "采购方式", cellType = Excel.ColumnType.STRING)
private String purchaseMethod; private String purchaseMethod;
/** 库存位置 */ /** 库存位置 */
@Excel(name = "库存位置") @Excel(name = "库存位置", cellType = Excel.ColumnType.STRING)
private String storageLocation; private String storageLocation;
/** 物品名称 */ /** 物品名称 */
@Excel(name = "物品名称") @Excel(name = "物品名称", cellType = Excel.ColumnType.STRING)
private String itemName; private String itemName;
/** 原厂编号 */ /** 原厂编号 */
@Excel(name = "原厂编号") @Excel(name = "原厂编号", cellType = Excel.ColumnType.STRING)
private String originalPartNumber; private String originalPartNumber;
/** 型号 */ /** 型号 */
@Excel(name = "型号") @Excel(name = "型号", cellType = Excel.ColumnType.STRING)
private String model; private String model;
/** 入库数量 */ /** 入库数量 */
@Excel(name = "入库数量") @Excel(name = "入库数量", cellType = Excel.ColumnType.NUMERIC)
private Long warehouseQuantity; private Long warehouseQuantity;
/** 剩余数量 */ /** 剩余数量 */
@Excel(name = "剩余数量") @Excel(name = "剩余数量", cellType = Excel.ColumnType.NUMERIC)
private Long remainingQuantity; private Long remainingQuantity;
/** 备注 */ /** 备注 */
@Excel(name = "备注") @Excel(name = "备注", cellType = Excel.ColumnType.STRING)
private String remarks; private String remarks;
/** 动态盘点数据 - 用于存储各种盘点列的值 */ /** 动态盘点数据 - 用于存储各种盘点列的值 */

20
os-ems/src/main/java/com/os/ems/info/domain/SparePartsUsageRecord.java
Unescape Escape View File

@ -23,43 +23,43 @@ public class SparePartsUsageRecord extends BaseEntity
private String date; private String date;
/** 备件名称 */ /** 备件名称 */
@Excel(name = "备件名称") @Excel(name = "备件名称", cellType = Excel.ColumnType.STRING)
private String sparePartName; private String sparePartName;
/** 备件型号 */ /** 备件型号 */
@Excel(name = "备件型号") @Excel(name = "备件型号", cellType = Excel.ColumnType.STRING)
private String sparePartModel; private String sparePartModel;
/** 使用数量 */ /** 使用数量 */
@Excel(name = "使用数量") @Excel(name = "使用数量", cellType = Excel.ColumnType.NUMERIC)
private Long quantityUsed; private Long quantityUsed;
/** 剩余数量 */ /** 剩余数量 */
@Excel(name = "剩余数量") @Excel(name = "剩余数量", cellType = Excel.ColumnType.NUMERIC)
private Long remainingQuantity; private Long remainingQuantity;
/** 领用库房 */ /** 领用库房 */
@Excel(name = "领用库房") @Excel(name = "领用库房", cellType = Excel.ColumnType.STRING)
private String issuingWarehouse; private String issuingWarehouse;
/** 更换位置 */ /** 更换位置 */
@Excel(name = "更换位置") @Excel(name = "更换位置", cellType = Excel.ColumnType.STRING)
private String replacementLocation; private String replacementLocation;
/** 领用人 */ /** 领用人 */
@Excel(name = "领用人") @Excel(name = "领用人", cellType = Excel.ColumnType.STRING)
private String personReceived; private String personReceived;
/** 库管确认人 */ /** 库管确认人 */
@Excel(name = "库管确认人") @Excel(name = "库管确认人", cellType = Excel.ColumnType.STRING)
private String warehouseManagerConfirmation; private String warehouseManagerConfirmation;
/** 库存表状态 */ /** 库存表状态 */
@Excel(name = "库存表状态") @Excel(name = "库存表状态", cellType = Excel.ColumnType.STRING)
private String inventoryStatus; private String inventoryStatus;
/** 部门仓库 */ /** 部门仓库 */
@Excel(name = "部门仓库") @Excel(name = "部门仓库", cellType = Excel.ColumnType.STRING)
private String departmentWarehouse; private String departmentWarehouse;
public void setId(Long id) public void setId(Long id)

16
os-ems/src/main/java/com/os/ems/info/domain/UpsBatteryLifecycle.java
Unescape Escape View File

@ -19,35 +19,35 @@ public class UpsBatteryLifecycle extends BaseEntity
private Long id; private Long id;
/** 类型 */ /** 类型 */
@Excel(name = "类型") @Excel(name = "类型", cellType = Excel.ColumnType.STRING)
private String type; private String type;
/** UPS安装柜体名称 */ /** UPS安装柜体名称 */
@Excel(name = "UPS安装柜体名称") @Excel(name = "UPS安装柜体名称", cellType = Excel.ColumnType.STRING)
private String upsInstallationCabinetName; private String upsInstallationCabinetName;
/** 参照位置 */ /** 参照位置 */
@Excel(name = "参照位置") @Excel(name = "参照位置", cellType = Excel.ColumnType.STRING)
private String referenceLocation; private String referenceLocation;
/** 位置描述 */ /** 位置描述 */
@Excel(name = "位置描述") @Excel(name = "位置描述", cellType = Excel.ColumnType.STRING)
private String locationDescription; private String locationDescription;
/** 现UPS来源 */ /** 现UPS来源 */
@Excel(name = "现UPS来源") @Excel(name = "现UPS来源", cellType = Excel.ColumnType.STRING)
private String currentUps; private String currentUps;
/** 取电 */ /** 取电 */
@Excel(name = "取电") @Excel(name = "取电", cellType = Excel.ColumnType.STRING)
private String powerSource; private String powerSource;
/** 涉及区域 */ /** 涉及区域 */
@Excel(name = "涉及区域") @Excel(name = "涉及区域", cellType = Excel.ColumnType.STRING)
private String affectedArea; private String affectedArea;
/** 备注 */ /** 备注 */
@Excel(name = "备注") @Excel(name = "备注", cellType = Excel.ColumnType.STRING)
private String remarks; private String remarks;
/** 第1次 */ /** 第1次 */

Write Preview
Loading…
Cancel
Save