From 58f63d0e061123b15f780d294272d8a461f183db Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 23 七月 2025 17:41:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java |  267 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 267 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java
new file mode 100644
index 0000000..e1985b7
--- /dev/null
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamReportAccidentsRegisterQuery.java
@@ -0,0 +1,267 @@
+package org.jeecg.modules.eam.request;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+
+/**
+ * @Description: 璁惧浜嬫晠鐧昏琛�
+ * @Author: jeecg-boot
+ * @Date:   2025-07-17
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class EamReportAccidentsRegisterQuery {
+    /**涓婚敭*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "涓婚敭")
+    private String id;
+    /**鍒涘缓浜�*/
+    @ApiModelProperty(value = "鍒涘缓浜�")
+    private String createBy;
+    /**鍒涘缓鏃ユ湡*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
+    private Date createTime;
+    /**鏇存柊浜�*/
+    @ApiModelProperty(value = "鏇存柊浜�")
+    private String updateBy;
+    /**鏇存柊鏃ユ湡*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "鏇存柊鏃ユ湡")
+    private Date updateTime;
+    /**鍒犻櫎鏍囪*/
+    @Excel(name = "鍒犻櫎鏍囪", width = 15)
+    @ApiModelProperty(value = "鍒犻櫎鏍囪")
+    @TableLogic
+    private String delFlag;
+    /**鎶ヤ慨ID*/
+    @Excel(name = "鎶ヤ慨ID", width = 15)
+    @ApiModelProperty(value = "鎶ヤ慨ID")
+    private String reportId;
+    /**璁惧ID*/
+    @Excel(name = "璁惧ID", width = 15)
+    @ApiModelProperty(value = "璁惧ID")
+    private String equipmentId;
+    /**鏄惁鏈夎澶囨搷浣滆瘉 鏄惁*/
+    @Excel(name = "鏄惁鏈夎澶囨搷浣滆瘉 鏄惁", width = 15)
+    @ApiModelProperty(value = "鏄惁鏈夎澶囨搷浣滆瘉 鏄惁")
+    @Dict(dicCode = "yn")
+    private String operationCertificate;
+    /**鏄惁鏂數閲嶅惎*/
+    @Excel(name = "鏄惁鏂數閲嶅惎", width = 15)
+    @ApiModelProperty(value = "鏄惁鏂數閲嶅惎")
+    @Dict(dicCode = "yn")
+    private String powerOffRestart;
+    /**鏄惁涓烘壒娆¢浠�*/
+    @Excel(name = "鏄惁涓烘壒娆¢浠�", width = 15)
+    @ApiModelProperty(value = "鏄惁涓烘壒娆¢浠�")
+    @Dict(dicCode = "yn")
+    private String batchFirstPiece;
+    /**鍙樺姩鍥犵礌 鏄惁*/
+    @Excel(name = "鍙樺姩鍥犵礌 鏄惁", width = 15)
+    @ApiModelProperty(value = "鍙樺姩鍥犵礌 鏄惁")
+    @Dict(dicCode = "yn")
+    private String variableFactors;
+    /**鍙樺姩鍥犵礌鍐呭 鍒�鍏锋洿鎹€�佸伐鑹烘洿鏀广�佸姞宸ョ▼搴忔洿鏀广�佸垁鍏疯ˉ鍋垮�兼洿鏀广��*/
+    @Excel(name = "鍙樺姩鍥犵礌鍐呭 鍒�鍏锋洿鎹€�佸伐鑹烘洿鏀广�佸姞宸ョ▼搴忔洿鏀广�佸垁鍏疯ˉ鍋垮�兼洿鏀广��", width = 15)
+    @ApiModelProperty(value = "鍙樺姩鍥犵礌鍐呭 鍒�鍏锋洿鎹€�佸伐鑹烘洿鏀广�佸姞宸ョ▼搴忔洿鏀广�佸垁鍏疯ˉ鍋垮�兼洿鏀�")
+    @Dict(dicCode = "variable_factors_value")
+    private String variableFactorsValue;
+    /**鎵ц绋嬪簭*/
+    @Excel(name = "鎵ц绋嬪簭", width = 15)
+    @ApiModelProperty(value = "鎵ц绋嬪簭")
+    private String executeNc;
+    /**浜嬫晠鐜拌薄*/
+    @Excel(name = "浜嬫晠鐜拌薄", width = 15)
+    @ApiModelProperty(value = "浜嬫晠鐜拌薄")
+    private String accidentPhenomenon;
+    /**閲囧彇鎺柦*/
+    @Excel(name = "閲囧彇鎺柦", width = 15)
+    @ApiModelProperty(value = "閲囧彇鎺柦")
+    private String measure;
+    /**閫犳垚缁撴灉*/
+    @Excel(name = "閫犳垚缁撴灉", width = 15)
+    @ApiModelProperty(value = "閫犳垚缁撴灉")
+    private String causingResults;
+    /**鎿嶄綔宸�*/
+    @Excel(name = "鎿嶄綔宸�", width = 15)
+    @ApiModelProperty(value = "鎿嶄綔宸�")
+    private String confirmer;
+    /**鎿嶄綔宸ョ‘璁ゆ椂闂�*/
+    @Excel(name = "鎿嶄綔宸ョ‘璁ゆ椂闂�", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "鎿嶄綔宸ョ‘璁ゆ椂闂�")
+    private Date confirmTime;
+    /**鍖洪暱*/
+    @Excel(name = "鍖洪暱", width = 15)
+    @ApiModelProperty(value = "鍖洪暱")
+    private String district;
+    /**鍖洪暱纭*/
+    @Excel(name = "鍖洪暱纭", width = 15)
+    @ApiModelProperty(value = "鍖洪暱纭")
+    private String districtConfirm;
+    /**鍖洪暱纭鏃堕棿*/
+    @Excel(name = "鍖洪暱纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "鍖洪暱纭鏃堕棿")
+    private Date districtTime;
+    /**涓績涓讳换*/
+    @Excel(name = "涓績涓讳换", width = 15)
+    @ApiModelProperty(value = "涓績涓讳换")
+    private String centerDirector;
+    /**涓績涓讳换纭*/
+    @Excel(name = "涓績涓讳换纭", width = 15)
+    @ApiModelProperty(value = "涓績涓讳换纭")
+    private String centerDirectorConfirm;
+    /**涓績涓讳换纭鏃堕棿*/
+    @Excel(name = "涓績涓讳换纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "涓績涓讳换纭鏃堕棿")
+    private Date centerDirectorTime;
+    /**缁翠慨寮�濮嬫椂闂�*/
+    @Excel(name = "缁翠慨寮�濮嬫椂闂�", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "缁翠慨寮�濮嬫椂闂�")
+    private Date reportStartTime;
+    /**璁惧鐘舵��*/
+    @Excel(name = "璁惧鐘舵��", width = 15)
+    @ApiModelProperty(value = "璁惧鐘舵��")
+    private String equipmentStatus;
+    /**鍘熷洜鍒嗘瀽*/
+    @Excel(name = "鍘熷洜鍒嗘瀽", width = 15)
+    @ApiModelProperty(value = "鍘熷洜鍒嗘瀽")
+    private String causeAnalysis;
+    /**妫�鏌ョ粨鏋�*/
+    @Excel(name = "妫�鏌ョ粨鏋�", width = 15)
+    @ApiModelProperty(value = "妫�鏌ョ粨鏋�")
+    private String inspectionResults;
+    /**閲囧彇鎺柦*/
+    @Excel(name = "閲囧彇鎺柦", width = 15)
+    @ApiModelProperty(value = "閲囧彇鎺柦")
+    private String takeSteps;
+    /**寤鸿閲囧彇鎺柦*/
+    @Excel(name = "寤鸿閲囧彇鎺柦", width = 15)
+    @ApiModelProperty(value = "寤鸿閲囧彇鎺柦")
+    private String suggestionTakeSteps;
+    /**寤鸿閲囧彇鎺柦鏃堕棿*/
+    @Excel(name = "寤鸿閲囧彇鎺柦鏃堕棿", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "寤鸿閲囧彇鎺柦鏃堕棿")
+    private Date suggestionTakeStepsTime;
+    /**缁翠慨纭*/
+    @Excel(name = "缁翠慨纭", width = 15)
+    @ApiModelProperty(value = "缁翠慨纭")
+    private String repairConfirm;
+    /**缁翠慨纭鎰忚*/
+    @Excel(name = "缁翠慨纭鎰忚", width = 15)
+    @ApiModelProperty(value = "缁翠慨纭鎰忚")
+    private String repairConfirmComment;
+    /**缁翠慨纭鏃堕棿*/
+    @Excel(name = "缁翠慨纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "缁翠慨纭鏃堕棿")
+    private Date repairConfirmTime;
+    /**缁翠慨缁勯暱纭*/
+    @Excel(name = "缁翠慨缁勯暱纭", width = 15)
+    @ApiModelProperty(value = "缁翠慨缁勯暱纭")
+    private String repairGroupLeader;
+    /**缁翠慨缁勯暱鎰忚*/
+    @Excel(name = "缁翠慨缁勯暱鎰忚", width = 15)
+    @ApiModelProperty(value = "缁翠慨缁勯暱鎰忚")
+    private String repairGroupLeaderComment;
+    /**缁翠慨缁勯暱纭鏃堕棿*/
+    @Excel(name = "缁翠慨缁勯暱纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "缁翠慨缁勯暱纭鏃堕棿")
+    private Date repairGroupLeaderTime;
+    /**缁翠慨缁勯暱纭*/
+    @Excel(name = "缁翠慨缁勯暱纭", width = 15)
+    @ApiModelProperty(value = "缁翠慨缁勯暱纭")
+    private String repairDistrict;
+    /**缁翠慨缁勯暱鎰忚*/
+    @Excel(name = "缁翠慨缁勯暱鎰忚", width = 15)
+    @ApiModelProperty(value = "缁翠慨缁勯暱鎰忚")
+    private String repairDistrictComment;
+    /**缁翠慨缁勯暱纭鏃堕棿*/
+    @Excel(name = "缁翠慨缁勯暱纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "缁翠慨缁勯暱纭鏃堕棿")
+    private Date repairDistrictTime;
+    /**鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰*/
+    @Excel(name = "鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰", width = 15)
+    @ApiModelProperty(value = "鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰")
+    private String checkAgree;
+    /**涓嶅悓鎰忓師鍥犲垎鏋�*/
+    @Excel(name = "涓嶅悓鎰忓師鍥犲垎鏋�", width = 15)
+    @ApiModelProperty(value = "涓嶅悓鎰忓師鍥犲垎鏋�")
+    private String disagreeReason;
+    /**鏁存敼鎺柦*/
+    @Excel(name = "鏁存敼鎺柦", width = 15)
+    @ApiModelProperty(value = "鏁存敼鎺柦")
+    private String rectificationMeasures;
+    /**浜嬫晠缁撹*/
+    @Excel(name = "浜嬫晠缁撹", width = 15)
+    @ApiModelProperty(value = "浜嬫晠缁撹")
+    private String accidentConclusion;
+    /**鎶�鏈礋璐d汉*/
+    @Excel(name = "鎶�鏈礋璐d汉", width = 15)
+    @ApiModelProperty(value = "鎶�鏈礋璐d汉")
+    private String technicalDirector;
+    /**鎶�鏈礋璐d汉纭鏃堕棿*/
+    @Excel(name = "鎶�鏈礋璐d汉纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "鎶�鏈礋璐d汉纭鏃堕棿")
+    private Date technicalDirectorTime;
+    /**鎶�鏈富绠″绾ч瀵�*/
+    @Excel(name = "鎶�鏈富绠″绾ч瀵�", width = 15)
+    @ApiModelProperty(value = "鎶�鏈富绠″绾ч瀵�")
+    private String technicalDirectorLeader;
+    /**鎶�鏈富绠″绾ч瀵肩‘璁ゆ椂闂�*/
+    @Excel(name = "鎶�鏈富绠″绾ч瀵肩‘璁ゆ椂闂�", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "鎶�鏈富绠″绾ч瀵肩‘璁ゆ椂闂�")
+    private Date technicalDirectorLeaderTime;
+    /**涓荤閮ㄧ骇棰嗗*/
+    @Excel(name = "涓荤閮ㄧ骇棰嗗", width = 15)
+    @ApiModelProperty(value = "涓荤閮ㄧ骇棰嗗")
+    private String technicalDirectorPart;
+    /**涓荤閮ㄧ骇棰嗗纭鏃堕棿*/
+    @Excel(name = "涓荤閮ㄧ骇棰嗗纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "涓荤閮ㄧ骇棰嗗纭鏃堕棿")
+    private Date technicalDirectorPartTime;
+    //鍒楄〃灞曠ず
+    @TableField(exist = false)
+    private String equipmentCode;
+    @TableField(exist = false)
+    private String equipmentName;
+    @TableField(exist = false)
+    private String equipmentModel;
+    @TableField(exist = false)
+    private String installationPosition;
+    private String column;
+    private String order;
+}

--
Gitblit v1.9.3