From 4b27dd367eae2f24958c6bb857fb6959dcdb7a4a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 13 六月 2025 18:04:46 +0800
Subject: [PATCH] 报表提交
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java | 129 ++++++++++++++++++++++++++++---------------
1 files changed, 84 insertions(+), 45 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
index 34b5611..3040ae4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
@@ -5,11 +5,9 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Map;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import lombok.experimental.Accessors;
import org.jeecg.common.constant.CommonConstant;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -38,31 +36,28 @@
@ApiModelProperty(value = "涓婚敭ID")
private String id;
/**缁翠慨璁㈠崟鍙�*/
- @Excel(name = "缁翠慨璁㈠崟鍙�", width = 15)
+ @Excel(name = "缁翠慨璁㈠崟鍙�", width = 15,orderNum = "5")
@ApiModelProperty(value = "缁翠慨璁㈠崟鍙�")
private String num;
/**璁惧鍙拌处ID*/
- @Excel(name = "璁惧鍙拌处ID", width = 15)
@ApiModelProperty(value = "璁惧鍙拌处ID")
private String equipmentId;
/**鏁呴殰鎶ヤ慨鍗旾D*/
- @Excel(name = "鏁呴殰鎶ヤ慨鍗旾D", width = 15)
@ApiModelProperty(value = "鏁呴殰鎶ヤ慨鍗旾D")
@Dict(dicCode = "id",dictTable ="mom_eam_equipment_report_repair",dicText = "num")
private String reportRepairId;
/**椤圭洰鎬х淮淇崟ID*/
- @Excel(name = "椤圭洰鎬х淮淇崟ID", width = 15)
@ApiModelProperty(value = "椤圭洰鎬х淮淇崟ID")
@Dict(dicCode = "id",dictTable ="mom_eam_project_maintenance_order",dicText = "num")
private String projectMaintenanceOrderId;
/**鐝粍ID*/
- @Excel(name = "鐝粍ID", width = 15)
+ @Excel(name = "缁翠慨鐝粍", width = 15,dicCode = "id",dictTable ="mom_base_team",dicText = "name",orderNum = "10")
@ApiModelProperty(value = "鐝粍ID")
@Dict(dicCode = "id",dictTable ="mom_base_team",dicText = "name")
private String teamId;
/**浣跨敤閮ㄩ棬ID*/
- @Excel(name = "浣跨敤閮ㄩ棬ID", width = 15)
+ @Excel(name = "浣跨敤閮ㄩ棬", width = 15,dicCode = "id",dictTable ="sys_depart",dicText = "depart_name",orderNum ="9" )
@ApiModelProperty(value = "浣跨敤閮ㄩ棬ID")
@Dict(dicCode = "id",dictTable ="sys_depart",dicText = "depart_name")
private String departId;
@@ -87,92 +82,87 @@
@ApiModelProperty(value = "棰勯槻鎺柦")
private String preventiveMeasure;
/**鏁呴殰鎻忚堪*/
- @Excel(name = "鏁呴殰鎻忚堪", width = 15)
+ @Excel(name = "鏁呴殰鎻忚堪", width = 15,orderNum = "16")
@ApiModelProperty(value = "鏁呴殰鎻忚堪")
private String faultDescription;
/**鏁呴殰鏃堕棿*/
- @Excel(name = "鏁呴殰鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鏁呴殰鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss",orderNum = "13")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鏁呴殰鏃堕棿")
private Date faultTime;
/**鏁呴殰鐓х墖*/
- @Excel(name = "鏁呴殰鐓х墖", width = 15)
@ApiModelProperty(value = "鏁呴殰鐓х墖")
private String photo;
/**鏄惁鍋滄満*/
- @Excel(name = "鏄惁鍋滄満", width = 15)
@ApiModelProperty(value = "鏄惁鍋滄満")
@Dict(dicCode = "is_stop")
private String isStop;
/**璁″垝寮�濮嬫椂闂�*/
- @Excel(name = "璁″垝寮�濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "璁″垝寮�濮嬫椂闂�")
private Date planStartTime;
/**璁″垝缁撴潫鏃堕棿*/
- @Excel(name = "璁″垝缁撴潫鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "璁″垝缁撴潫鏃堕棿")
private Date planEndTime;
/**瀹為檯寮�濮嬫椂闂�*/
- @Excel(name = "瀹為檯寮�濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
private Date actualStartTime;
/**瀹為檯缁撴潫鏃堕棿*/
- @Excel(name = "瀹為檯缁撴潫鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
private Date actualEndTime;
/**棰嗗彇浜篒D*/
- @Excel(name = "棰嗗彇浜�", width = 15)
@ApiModelProperty(value = "棰嗗彇浜篒D")
@Dict(dicCode = "id",dictTable ="sys_user",dicText = "username")
private String recipientUserId;
/**鎶ヤ慨浜篒D*/
- @Excel(name = "鎶ヤ慨浜�", width = 15)
@ApiModelProperty(value = "鎶ヤ慨浜篒D")
@Dict(dicCode = "id",dictTable ="sys_user",dicText = "username")
private String reportUserId;
/**宸ユ椂瀹氶*/
- @Excel(name = "宸ユ椂瀹氶", width = 15)
@ApiModelProperty(value = "宸ユ椂瀹氶")
private BigDecimal workingHourQuota;
/**宸ュ崟鎵ц鐘舵�侊紙鏁版嵁瀛楀吀锛歳epair_order_status锛�*/
- @Excel(name = "宸ュ崟鎵ц鐘舵�侊紙鏁版嵁瀛楀吀锛歳epair_order_status锛�", width = 15)
- @ApiModelProperty(value = "宸ュ崟鎵ц鐘舵�侊紙鏁版嵁瀛楀吀锛歳epair_order_status锛�")
- @Dict(dicCode = "repair_order_status")
+ @ApiModelProperty(value = "宸ュ崟鎵ц鐘舵�侊紙鏁版嵁瀛楀吀锛歵rue_repair_status锛�")
+ @Dict(dicCode = "true_repair_status")
+ @Excel(name = "鐘舵��", width = 15,orderNum = "3",dicCode = "true_repair_status")
private String status;
/**缁翠繚鏂瑰紡*/
- @Excel(name = "缁翠繚鏂瑰紡", width = 15)
@ApiModelProperty(value = "缁翠繚鏂瑰紡")
@Dict(dicCode = "maintenance_method")
private String maintenanceMethod;
/**澶囩敤瀛楁1*/
- @Excel(name = "澶囩敤瀛楁1", width = 15)
+ @Excel(name = "缁翠慨鐘舵��", width = 15,orderNum = "4",dicCode = "repair_status" )
@ApiModelProperty(value = "澶囩敤瀛楁1")
+ @Dict(dicCode = "repair_status")
private String repairOrderUda1;
/**澶囩敤瀛楁2*/
- @Excel(name = "澶囩敤瀛楁2", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁2")
- private String repairOrderUda2;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date repairOrderUda2;
/**澶囩敤瀛楁3*/
- @Excel(name = "澶囩敤瀛楁3", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁3")
- private String repairOrderUda3;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date repairOrderUda3;
/**澶囩敤瀛楁4*/
- @Excel(name = "澶囩敤瀛楁4", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁4")
- private String repairOrderUda4;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date repairOrderUda4;
/**澶囩敤瀛楁5*/
- @Excel(name = "澶囩敤瀛楁5", width = 15)
@ApiModelProperty(value = "澶囩敤瀛楁5")
- private String repairOrderUda5;
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date repairOrderUda5;
/**鍒涘缓浜�*/
@ApiModelProperty(value = "鍒涘缓浜�")
private String createBy;
@@ -180,6 +170,7 @@
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 15,orderNum = "8",databaseFormat = "yyyy-MM-dd HH:mm:ss",exportFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**淇敼浜�*/
@ApiModelProperty(value = "淇敼浜�")
@@ -190,70 +181,67 @@
@ApiModelProperty(value = "淇敼鏃堕棿")
private Date updateTime;
/**鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)*/
- @Excel(name = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)", width = 15)
@ApiModelProperty(value = "鍒犻櫎鐘舵��(0-姝ｅ父,1-宸插垹闄�)")
@Dict(dicCode = "del_flag")
private Integer delFlag = CommonConstant.DEL_FLAG_0;
/**缁翠慨宸ュ崟绫诲瀷锛堟暟鎹瓧鍏革細repair_order_type,0:姝ｅ父缁翠慨宸ュ崟锛�1:淇悗姹囨姤宸ュ崟锛�*/
- @Excel(name = "缁翠慨宸ュ崟绫诲瀷", width = 15)
@ApiModelProperty(value = "缁翠慨宸ュ崟绫诲瀷")
@Dict(dicCode = "repair_order_type")
private Integer repairOrderType;
/**绉熸埛ID*/
- @Excel(name = "绉熸埛ID", width = 15)
@ApiModelProperty(value = "绉熸埛ID")
private String tenantId;
/**澶囨敞*/
- @Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
/**浼佷笟ID*/
- @Excel(name = "浼佷笟ID", width = 15)
@ApiModelProperty(value = "浼佷笟ID")
private String enterpriseId;
/**浼佷笟ID*/
- @Excel(name = "璐ｄ换浜篒D", width = 15)
@Dict(dicCode = "id",dictTable ="sys_user",dicText = "realname")
@ApiModelProperty(value = "璐ｄ换浜篒D")
private String responsibilityId;
/*濮斿鍗曚綅*/
- @Excel(name = "濮斿鍗曚綅", width = 15)
@ApiModelProperty(value = "濮斿鍗曚綅")
private String outsourcingUnit;
/*瀹為檯宸ユ椂*/
- @Excel(name = "瀹為檯宸ユ椂", width = 15)
@ApiModelProperty(value = "瀹為檯宸ユ椂")
private BigDecimal actualHour;
/**绱ф�ョ▼搴�*/
- @Excel(name = "绱ф�ョ▼搴�", width = 15)
@ApiModelProperty(value = "绱ф�ョ▼搴�")
@Dict(dicCode = "urgency")
private String urgency;
/**娲惧伐鏂瑰紡*/
- @Excel(name = "娲惧伐鏂瑰紡", width = 15)
@ApiModelProperty(value = "娲惧伐鏂瑰紡")
@Dict(dicCode = "dispatch_method")
private String dispatchMethod;
/**涓氬姟绫诲瀷*/
- @Excel(name = "涓氬姟绫诲瀷", width = 15)
@ApiModelProperty(value = "涓氬姟绫诲瀷")
@Dict(dicCode = "repair_order_business_type")
private String businessType;
+ private BigDecimal spareTime;
+
+ private BigDecimal partTime;
+
+
@TableField(exist = false)
+ @Excel(name = "缁熶竴缂栫爜", width = 15,orderNum = "6")
private String equipmentNum;
@TableField(exist = false)
+ @Excel(name = "璁惧鍚嶇О", width = 15,orderNum = "7")
private String equipmentName;
@TableField(exist = false)
+ @Excel(name = "璁惧鍨嬪彿", width = 15,orderNum = "8")
private String equipmentModel;
@TableField(exist = false)
private String reportRepairNum;
@@ -267,9 +255,12 @@
private String responsibilityName;
@TableField(exist = false)
private String teamName;
+ @TableField(exist = false)
+ private String faultCause;
@TableField(exist = false)
@Dict(dicCode = "specific_equipment")
+ @Excel(name = "鍏抽敭璁惧鏍囪瘑", width = 15,orderNum = "0",dicCode = "specific_equipment")
private String specificEquipment;
@TableField(exist = false)
List<RepairOrderFaultAnalysis> faultAnalysis;
@@ -279,5 +270,53 @@
List<RepairOrderActualWorkHours> actualHours;
@TableField(exist = false)
List<RepairOrderDetail> orderDetails;
+ @TableField(exist = false)
+ private String factoryModelId;
+ @TableField(exist = false)
+ private String equipmentCategoryId;
+ @TableField(exist = false)
+ private String userId;
+ @TableField(exist = false)
+ private String nums;
+ @TableField(exist = false)
+ @Excel(name = "鎶ヤ慨浜�", width = 15,orderNum = "14")
+ private String errUda2;
+ @TableField(exist = false)
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date acceptTime;
+ @TableField(exist = false)
+ private String errUda3;
+ @TableField(exist = false)
+ private BigDecimal faultHour;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(exist = false)
+ private Date faultStartTime;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(exist = false)
+ private Date faultEndTime;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(exist = false)
+ private Date createStartTime;
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(exist = false)
+ private Date createEndTime;
+ @TableField(exist = false)
+ @Excel(name = "ABC鏍囪瘑", width = 15,orderNum = "1")
+ private String equipmentImportanceId;
+ @TableField(exist = false)
+ private List<Map<String, Object>> allFaultCause;
+
+ @TableField(exist = false)
+ private String faultCauseCount;
+
+ @TableField(exist = false)
+ private List<Map<String, Object>> equipmentFaultCause;
+ @TableField(exist = false)
+ private String statusEnums;
}
--
Gitblit v1.9.3