From f1b7de2d0bf989ff38b0bd2c52d4bb8b753af42c Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 24 七月 2025 18:13:59 +0800
Subject: [PATCH] 设备维修
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportAccidentsRegisterDto.java | 290 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 176 insertions(+), 114 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportAccidentsRegisterDto.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportAccidentsRegisterDto.java
index 6c37b44..10fb8df 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportAccidentsRegisterDto.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportAccidentsRegisterDto.java
@@ -8,6 +8,7 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -21,243 +22,292 @@
* @Version: V1.0
*/
@Data
-@TableName("eam_report_accidents_register")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
-public class EamReportAccidentsRegisterDto {
+public class EamReportAccidentsRegisterDto extends FlowTaskVo implements Serializable {
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
+ private static final long serialVersionUID = 3844096033304425984L;
+
+ /**涓婚敭*/
+ @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")
+ /**鍒涘缓鏃ユ湡*/
+ @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")
+ /**鏇存柊鏃ユ湡*/
+ @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)
+ /**鍒犻櫎鏍囪*/
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
private String delFlag;
- /**鎶ヤ慨ID*/
- @Excel(name = "鎶ヤ慨ID", width = 15)
+ /**鎶ヤ慨ID*/
+ @Excel(name = "鎶ヤ慨ID", width = 15)
@ApiModelProperty(value = "鎶ヤ慨ID")
private String reportId;
- /**璁惧ID*/
- @Excel(name = "璁惧ID", width = 15)
+ /**璁惧ID*/
+ @Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
- /**鏄惁鏈夎澶囨搷浣滆瘉 鏄惁*/
- @Excel(name = "鏄惁鏈夎澶囨搷浣滆瘉 鏄惁", width = 15)
+ /**鐧昏鐘舵��*/
+ @ApiModelProperty(value = "鐧昏鐘舵��")
+ @Dict(dicCode = "eam_report_accidents_register_status")
+ private String registerStatus;
+ /**鏄惁鏈夎澶囨搷浣滆瘉 鏄惁*/
+ @Excel(name = "鏄惁鏈夎澶囨搷浣滆瘉 鏄惁", width = 15)
@ApiModelProperty(value = "鏄惁鏈夎澶囨搷浣滆瘉 鏄惁")
@Dict(dicCode = "yn")
private String operationCertificate;
- /**鏄惁鏂數閲嶅惎*/
- @Excel(name = "鏄惁鏂數閲嶅惎", width = 15)
+ /**鏄惁鏂數閲嶅惎*/
+ @Excel(name = "鏄惁鏂數閲嶅惎", width = 15)
@ApiModelProperty(value = "鏄惁鏂數閲嶅惎")
@Dict(dicCode = "yn")
private String powerOffRestart;
- /**鏄惁涓烘壒娆￠浠�*/
- @Excel(name = "鏄惁涓烘壒娆￠浠�", width = 15)
+ /**鏄惁涓烘壒娆￠浠�*/
+ @Excel(name = "鏄惁涓烘壒娆￠浠�", width = 15)
@ApiModelProperty(value = "鏄惁涓烘壒娆￠浠�")
@Dict(dicCode = "yn")
private String batchFirstPiece;
- /**鍙樺姩鍥犵礌 鏄惁*/
- @Excel(name = "鍙樺姩鍥犵礌 鏄惁", width = 15)
+ /**鍙樺姩鍥犵礌 鏄惁*/
+ @Excel(name = "鍙樺姩鍥犵礌 鏄惁", width = 15)
@ApiModelProperty(value = "鍙樺姩鍥犵礌 鏄惁")
@Dict(dicCode = "yn")
private String variableFactors;
- /**鍙樺姩鍥犵礌鍐呭 鍒�鍏锋洿鎹€�佸伐鑹烘洿鏀广�佸姞宸ョ▼搴忔洿鏀广�佸垁鍏疯ˉ鍋垮�兼洿鏀广��*/
- @Excel(name = "鍙樺姩鍥犵礌鍐呭 鍒�鍏锋洿鎹€�佸伐鑹烘洿鏀广�佸姞宸ョ▼搴忔洿鏀广�佸垁鍏疯ˉ鍋垮�兼洿鏀广��", width = 15)
+ /**鍙樺姩鍥犵礌鍐呭 鍒�鍏锋洿鎹€�佸伐鑹烘洿鏀广�佸姞宸ョ▼搴忔洿鏀广�佸垁鍏疯ˉ鍋垮�兼洿鏀广��*/
+ @Excel(name = "鍙樺姩鍥犵礌鍐呭 鍒�鍏锋洿鎹€�佸伐鑹烘洿鏀广�佸姞宸ョ▼搴忔洿鏀广�佸垁鍏疯ˉ鍋垮�兼洿鏀广��", width = 15)
@ApiModelProperty(value = "鍙樺姩鍥犵礌鍐呭 鍒�鍏锋洿鎹€�佸伐鑹烘洿鏀广�佸姞宸ョ▼搴忔洿鏀广�佸垁鍏疯ˉ鍋垮�兼洿鏀�")
@Dict(dicCode = "variable_factors_value")
private String variableFactorsValue;
- /**鎵ц绋嬪簭*/
- @Excel(name = "鎵ц绋嬪簭", width = 15)
+ /**鎵ц绋嬪簭*/
+ @Excel(name = "鎵ц绋嬪簭", width = 15)
@ApiModelProperty(value = "鎵ц绋嬪簭")
private String executeNc;
- /**浜嬫晠鐜拌薄*/
- @Excel(name = "浜嬫晠鐜拌薄", width = 15)
+ /**浜嬫晠鐜拌薄*/
+ @Excel(name = "浜嬫晠鐜拌薄", width = 15)
@ApiModelProperty(value = "浜嬫晠鐜拌薄")
private String accidentPhenomenon;
- /**閲囧彇鎺柦*/
- @Excel(name = "閲囧彇鎺柦", width = 15)
+ /**閲囧彇鎺柦*/
+ @Excel(name = "閲囧彇鎺柦", width = 15)
@ApiModelProperty(value = "閲囧彇鎺柦")
private String measure;
- /**閫犳垚缁撴灉*/
- @Excel(name = "閫犳垚缁撴灉", width = 15)
+ /**閫犳垚缁撴灉*/
+ @Excel(name = "閫犳垚缁撴灉", width = 15)
@ApiModelProperty(value = "閫犳垚缁撴灉")
private String causingResults;
- /**鎿嶄綔宸�*/
- @Excel(name = "鎿嶄綔宸�", width = 15)
+ /**鎿嶄綔宸�*/
+ @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")
+ /**鎿嶄綔宸ョ‘璁ゆ椂闂�*/
+ @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)
+ /**鍖洪暱*/
+ @Excel(name = "鍖洪暱", width = 15)
@ApiModelProperty(value = "鍖洪暱")
private String district;
/**鍖洪暱纭*/
@Excel(name = "鍖洪暱纭", width = 15)
- @ApiModelProperty(value = "鍖洪暱纭")
+ @ApiModelProperty(value = "鍖洪暱纭鎰忚")
private String districtConfirm;
- /**鍖洪暱纭鏃堕棿*/
- @Excel(name = "鍖洪暱纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ /**鍖洪暱纭鏃堕棿*/
+ @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)
+ /**鍖洪暱纭缁撴灉*/
+ @Excel(name = "鍖洪暱纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "鍖洪暱纭缁撴灉")
+ private String districtResult;
+ /**涓績涓讳换*/
+ @Excel(name = "涓績涓讳换", width = 15)
@ApiModelProperty(value = "涓績涓讳换")
private String centerDirector;
/**涓績涓讳换纭*/
@Excel(name = "涓績涓讳换纭", width = 15)
- @ApiModelProperty(value = "涓績涓讳换纭")
+ @ApiModelProperty(value = "涓績涓讳换纭鎰忚")
private String centerDirectorConfirm;
- /**涓績涓讳换纭鏃堕棿*/
- @Excel(name = "涓績涓讳换纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ /**涓績涓讳换纭缁撴灉*/
+ @Excel(name = "涓績涓讳换纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "涓績涓讳换纭缁撴灉")
+ private String centerDirectorResult;
+ /**涓績涓讳换纭鏃堕棿*/
+ @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")
+ /**缁翠慨寮�濮嬫椂闂�*/
+ @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)
+ /**璁惧鐘舵��*/
+ @Excel(name = "璁惧鐘舵��", width = 15)
@ApiModelProperty(value = "璁惧鐘舵��")
private String equipmentStatus;
- /**鍘熷洜鍒嗘瀽*/
- @Excel(name = "鍘熷洜鍒嗘瀽", width = 15)
+ /**鍘熷洜鍒嗘瀽*/
+ @Excel(name = "鍘熷洜鍒嗘瀽", width = 15)
@ApiModelProperty(value = "鍘熷洜鍒嗘瀽")
private String causeAnalysis;
- /**妫�鏌ョ粨鏋�*/
- @Excel(name = "妫�鏌ョ粨鏋�", width = 15)
+ /**妫�鏌ョ粨鏋�*/
+ @Excel(name = "妫�鏌ョ粨鏋�", width = 15)
@ApiModelProperty(value = "妫�鏌ョ粨鏋�")
private String inspectionResults;
- /**閲囧彇鎺柦*/
- @Excel(name = "閲囧彇鎺柦", width = 15)
+ /**閲囧彇鎺柦*/
+ @Excel(name = "閲囧彇鎺柦", width = 15)
@ApiModelProperty(value = "閲囧彇鎺柦")
private String takeSteps;
- /**寤鸿閲囧彇鎺柦*/
- @Excel(name = "寤鸿閲囧彇鎺柦", width = 15)
+ /**寤鸿閲囧彇鎺柦*/
+ @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")
+ /**寤鸿閲囧彇鎺柦鏃堕棿*/
+ @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)
+ /**缁翠慨宸ョ‘璁�*/
+ @Excel(name = "缁翠慨宸ョ‘璁�", width = 15)
@ApiModelProperty(value = "缁翠慨纭")
private String repairConfirm;
- /**缁翠慨纭鎰忚*/
- @Excel(name = "缁翠慨纭鎰忚", width = 15)
+ /**缁翠慨宸ョ‘璁ょ粨鏋�*/
+ @Excel(name = "缁翠慨宸ョ‘璁ょ粨鏋�", width = 15)
+ @ApiModelProperty(value = "缁翠慨宸ョ‘璁ょ粨鏋�")
+ private String repairConfirmResult;
+ /**缁翠慨宸ョ‘璁ゆ剰瑙�*/
+ @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")
+ /**缁翠慨宸ョ‘璁ゆ椂闂�*/
+ @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)
+ /**缁翠慨缁勯暱纭*/
+ @Excel(name = "缁翠慨缁勯暱纭", width = 15)
@ApiModelProperty(value = "缁翠慨缁勯暱纭")
private String repairGroupLeader;
- /**缁翠慨缁勯暱鎰忚*/
- @Excel(name = "缁翠慨缁勯暱鎰忚", width = 15)
+ /**缁翠慨缁勯暱鎰忚*/
+ @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")
+ /**缁翠慨缁勯暱纭缁撴灉*/
+ @Excel(name = "缁翠慨缁勯暱纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "缁翠慨缁勯暱纭缁撴灉")
+ private String repairGroupLeaderResult;
+ /**缁翠慨缁勯暱纭鏃堕棿*/
+ @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 = "缁翠慨缁勯暱纭")
+ /**缁翠慨缁勯暱(鍖洪暱)纭*/
+ @Excel(name = "缁翠慨缁勯暱(鍖洪暱)纭", width = 15)
+ @ApiModelProperty(value = "缁翠慨缁勯暱(鍖洪暱)纭")
private String repairDistrict;
- /**缁翠慨缁勯暱鎰忚*/
- @Excel(name = "缁翠慨缁勯暱鎰忚", width = 15)
- @ApiModelProperty(value = "缁翠慨缁勯暱鎰忚")
+ /**缁翠慨缁勯暱(鍖洪暱)鎰忚*/
+ @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")
+ /**缁翠慨缁勯暱(鍖洪暱)纭缁撴灉*/
+ @Excel(name = "缁翠慨缁勯暱(鍖洪暱)纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "缁翠慨缁勯暱(鍖洪暱)纭缁撴灉")
+ private String repairDistrictResult;
+ /**缁翠慨缁勯暱(鍖洪暱)纭鏃堕棿*/
+ @Excel(name = "缁翠慨缁勯暱纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "缁翠慨缁勯暱纭鏃堕棿")
+ @ApiModelProperty(value = "缁翠慨缁勯暱(鍖洪暱)纭鏃堕棿")
private Date repairDistrictTime;
- /**鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰*/
- @Excel(name = "鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰", width = 15)
+ /**鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰*/
+ @Excel(name = "鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰", width = 15)
@ApiModelProperty(value = "鍘熷洜鍒嗘瀽鏍稿鍚屾剰銆佷笉鍚屾剰")
private String checkAgree;
- /**涓嶅悓鎰忓師鍥犲垎鏋�*/
- @Excel(name = "涓嶅悓鎰忓師鍥犲垎鏋�", width = 15)
+ /**涓嶅悓鎰忓師鍥犲垎鏋�*/
+ @Excel(name = "涓嶅悓鎰忓師鍥犲垎鏋�", width = 15)
@ApiModelProperty(value = "涓嶅悓鎰忓師鍥犲垎鏋�")
private String disagreeReason;
- /**鏁存敼鎺柦*/
- @Excel(name = "鏁存敼鎺柦", width = 15)
+ /**鏁存敼鎺柦*/
+ @Excel(name = "鏁存敼鎺柦", width = 15)
@ApiModelProperty(value = "鏁存敼鎺柦")
private String rectificationMeasures;
- /**浜嬫晠缁撹*/
- @Excel(name = "浜嬫晠缁撹", width = 15)
+ /**浜嬫晠缁撹*/
+ @Excel(name = "浜嬫晠缁撹", width = 15)
@ApiModelProperty(value = "浜嬫晠缁撹")
private String accidentConclusion;
- /**鎶�鏈礋璐ｄ汉*/
- @Excel(name = "鎶�鏈礋璐ｄ汉", width = 15)
+ /**鎶�鏈礋璐ｄ汉*/
+ @Excel(name = "鎶�鏈礋璐ｄ汉", width = 15)
@ApiModelProperty(value = "鎶�鏈礋璐ｄ汉")
private String technicalDirector;
- /**鎶�鏈礋璐ｄ汉纭鏃堕棿*/
- @Excel(name = "鎶�鏈礋璐ｄ汉纭鏃堕棿", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ /**鎶�鏈礋璐ｄ汉纭鎰忚*/
+ @Excel(name = "鎶�鏈礋璐ｄ汉纭鎰忚", width = 15)
+ @ApiModelProperty(value = "鎶�鏈礋璐ｄ汉纭鎰忚")
+ private String technicalDirectorConfirm;
+ /**鎶�鏈礋璐ｄ汉纭缁撴灉*/
+ @Excel(name = "鎶�鏈礋璐ｄ汉纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "鎶�鏈礋璐ｄ汉纭缁撴灉")
+ private String technicalDirectorResult;
+ /**鎶�鏈礋璐ｄ汉纭鏃堕棿*/
+ @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 technicalDirectorTime;
- /**鎶�鏈富绠″绾ч瀵�*/
- @Excel(name = "鎶�鏈富绠″绾ч瀵�", width = 15)
+ /**鎶�鏈富绠″绾ч瀵�*/
+ @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")
+ /**鎶�鏈富绠″绾ч瀵肩‘璁ゆ剰瑙�*/
+ @Excel(name = "鎶�鏈富绠″绾ч瀵肩‘璁ゆ剰瑙�", width = 15)
+ @ApiModelProperty(value = "鎶�鏈富绠″绾ч瀵肩‘璁ゆ剰瑙�")
+ private String technicalDirectorLeaderConfirm;
+ /**鎶�鏈富绠″绾ч瀵肩‘璁ょ粨鏋�*/
+ @Excel(name = "鎶�鏈富绠″绾ч瀵肩‘璁ょ粨鏋�", width = 15)
+ @ApiModelProperty(value = "鎶�鏈富绠″绾ч瀵肩‘璁ょ粨鏋�")
+ private String technicalDirectorLeaderResult;
+ /**鎶�鏈富绠″绾ч瀵肩‘璁ゆ椂闂�*/
+ @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)
+ /**涓荤閮ㄧ骇棰嗗*/
+ @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")
+ /**涓荤閮ㄧ骇棰嗗纭鏃堕棿*/
+ @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;
+ /**涓荤閮ㄧ骇棰嗗纭鎰忚*/
+ @Excel(name = "涓荤閮ㄧ骇棰嗗纭鎰忚", width = 15)
+ @ApiModelProperty(value = "涓荤閮ㄧ骇棰嗗纭鎰忚")
+ private String technicalDirectorPartConfirm;
+ /**涓荤閮ㄧ骇棰嗗纭缁撴灉*/
+ @Excel(name = "涓荤閮ㄧ骇棰嗗纭缁撴灉", width = 15)
+ @ApiModelProperty(value = "涓荤閮ㄧ骇棰嗗纭缁撴灉")
+ private String technicalDirectorPartResult;
//鍒楄〃灞曠ず
@TableField(exist = false)
private String equipmentCode;
@@ -267,4 +317,16 @@
private String equipmentModel;
@TableField(exist = false)
private String installationPosition;
+ /**搴熷搧浠跺彿*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "搴熷搧浠跺彿")
+ private String scrapPartNumber;
+ /**搴熷搧浠舵暟*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "搴熷搧浠舵暟")
+ private String scrapPartQuantity;
+ /**搴熷搧浠峰��*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "搴熷搧浠峰��")
+ private String scrapPartValue;
}
--
Gitblit v1.9.3