From 23a41447d547a32ec67925b970162e91730e2561 Mon Sep 17 00:00:00 2001 From: cuikaidong <ckd2942379034@163.com> Date: 星期五, 23 五月 2025 17:14:22 +0800 Subject: [PATCH] 封存启封功能完善,启封,编辑功能 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java | 232 +++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 157 insertions(+), 75 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java index 5c78c33..9f91cce 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentSealUp.java @@ -16,91 +16,173 @@ import java.io.Serializable; import java.util.Date; + /** * @Description: 璁惧灏佸瓨鍚皝 * @Author: jeecg-boot - * @Date: 2025-05-13 + * @Date: 2025-05-13 * @Version: V1.0 */ @Data @TableName("eam_equipment_seal_up") @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@ApiModel(value="eam_equipment_seal_up瀵硅薄", description="璁惧灏佸瓨鍚皝") +@ApiModel(value = "eam_equipment_seal_up瀵硅薄", description = "璁惧灏佸瓨鍚皝") public class EamEquipmentSealUp implements Serializable { - - /**涓婚敭*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "涓婚敭") - private String id; - /**鍒涘缓浜�*/ - @Excel(name = "鍒涘缓浜�", width = 15) - @ApiModelProperty(value = "鍒涘缓浜�") - private String createBy; - /**鍒涘缓鏃堕棿*/ - @ApiModelProperty(value = "鍒涘缓鏃堕棿") - private Date createTime; - /**鏇存柊浜�*/ - @Excel(name = "鏇存柊浜�", width = 15) - @ApiModelProperty(value = "鏇存柊浜�") - private String updateBy; - /**鏇存柊鏃堕棿*/ - @ApiModelProperty(value = "鏇存柊鏃堕棿") - private Date updateTime; - /**鍒犻櫎鏍囪*/ - @Excel(name = "鍒犻櫎鏍囪", width = 15) - @ApiModelProperty(value = "鍒犻櫎鏍囪") - private Integer delFlag; - /**璁惧ID*/ - @Excel(name = "璁惧ID", width = 15) - @ApiModelProperty(value = "璁惧ID") - private String equipmentId; - /**鍗曟嵁鍙�*/ - @Excel(name = "鍗曟嵁鍙�", width = 15) - @ApiModelProperty(value = "鍗曟嵁鍙�") - private String code; - /**鐢宠浜�*/ - @Excel(name = "鐢宠浜�", width = 15) - @ApiModelProperty(value = "鐢宠浜�") - @Dict(dicCode = "sys_user, realname, username") - private String reportUser; - /**灏佸瓨寮�濮嬫椂闂�*/ - @ApiModelProperty(value = "灏佸瓨寮�濮嬫椂闂�") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date sealStartTime; - /**灏佸瓨缁撴潫鏃堕棿*/ - @ApiModelProperty(value = "灏佸瓨缁撴潫鏃堕棿") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date sealEndTime; - /**灏佸瓨鍘熷洜*/ - @Excel(name = "灏佸瓨鍘熷洜", width = 15) - @ApiModelProperty(value = "灏佸瓨鍘熷洜") - private String sealUpReason; - /**灏佸瓨鐘舵��*/ - @Excel(name = "灏佸瓨鐘舵��", width = 15) - @ApiModelProperty(value = "灏佸瓨鐘舵��") - @Dict(dicCode = "equipment_seal_up_status") - private String sealStatus; - /**瀹℃牳浜�*/ - @Excel(name = "瀹℃牳浜�", width = 15) - @ApiModelProperty(value = "瀹℃牳浜�") - private String approvalUser; - /**瀹℃牳鏃堕棿*/ - @ApiModelProperty(value = "瀹℃牳鏃堕棿") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date approvalTime; - /**澶囨敞*/ - @Excel(name = "澶囨敞", width = 15) - @ApiModelProperty(value = "澶囨敞") - private String remark; - //鍒楄〃灞曠ず - @TableField(exist = false) - private String equipmentCode; - @TableField(exist = false) - private String equipmentName; + /** + * 涓婚敭 + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "涓婚敭") + private String id; + /** + * 鍒涘缓浜� + */ + @Excel(name = "鍒涘缓浜�", width = 15) + @ApiModelProperty(value = "鍒涘缓浜�") + private String createBy; + /** + * 鍒涘缓鏃堕棿 + */ + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; + /** + * 鏇存柊浜� + */ + @Excel(name = "鏇存柊浜�", width = 15) + @ApiModelProperty(value = "鏇存柊浜�") + private String updateBy; + /** + * 鏇存柊鏃堕棿 + */ + @ApiModelProperty(value = "鏇存柊鏃堕棿") + private Date updateTime; + /** + * 鍒犻櫎鏍囪 + */ + @Excel(name = "鍒犻櫎鏍囪", width = 15) + @ApiModelProperty(value = "鍒犻櫎鏍囪") + private Integer delFlag; + /** + * 璁惧ID + */ + @Excel(name = "璁惧ID", width = 15) + @ApiModelProperty(value = "璁惧ID") + private String equipmentId; + /** + * 鍗曟嵁鍙� + */ + @Excel(name = "鍗曟嵁鍙�", width = 15) + @ApiModelProperty(value = "鍗曟嵁鍙�") + private String code; + /** + * 鐢宠浜� + */ + @Excel(name = "鐢宠浜�", width = 15) + @ApiModelProperty(value = "鐢宠浜�") + @Dict(dicCode = "sys_user, realname, username") + private String reportUser; + /** + * 灏佸瓨寮�濮嬫椂闂� + */ + @ApiModelProperty(value = "灏佸瓨寮�濮嬫椂闂�") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date sealStartTime; + /** + * 灏佸瓨缁撴潫鏃堕棿 + */ + @ApiModelProperty(value = "灏佸瓨缁撴潫鏃堕棿") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date sealEndTime; + /** + * 灏佸瓨鍘熷洜 + */ + @Excel(name = "灏佸瓨鍘熷洜", width = 15) + @ApiModelProperty(value = "灏佸瓨鍘熷洜") + private String sealUpReason; + /** + * 灏佸瓨鐘舵�� + */ + @Excel(name = "灏佸瓨鐘舵��", width = 15) + @ApiModelProperty(value = "灏佸瓨鐘舵��") + @Dict(dicCode = "equipment_seal_up_status") + private String sealStatus; + /** + * 瀹℃牳浜� + */ + @Excel(name = "瀹℃牳浜�", width = 15) + @ApiModelProperty(value = "瀹℃牳浜�") + private String approvalUser; + /** + * 瀹℃牳鏃堕棿 + */ + @ApiModelProperty(value = "瀹℃牳鏃堕棿") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date approvalTime; + /** + * 澶囨敞 + */ + @Excel(name = "澶囨敞", width = 15) + @ApiModelProperty(value = "澶囨敞") + private String remark; + /** + * 瀹℃牳绫诲瀷 + */ + @Excel(name = "瀹℃牳绫诲瀷", width = 15) + @ApiModelProperty(value = "瀹℃牳绫诲瀷") + private String approvalDealType; + /** + * 瀹℃牳鎰忚 + */ + @Excel(name = "瀹℃牳鎰忚", width = 15) + @ApiModelProperty(value = "瀹℃牳鎰忚") + private String approvalComment; + /** + * 鍚皝鐢宠浜� + */ + @Excel(name = "鍚皝鐢宠浜�", width = 15) + @ApiModelProperty(value = "鍚皝鐢宠浜�") + private String unsealReportUser; + /** + * 鍚皝鍘熷洜 + */ + @Excel(name = "鍚皝鍘熷洜", width = 15) + @ApiModelProperty(value = "鍚皝鍘熷洜") + private String unsealReason; + /** + * 鍚皝瀹℃牳浜� + */ + @Excel(name = "鍚皝瀹℃牳浜�", width = 15) + @ApiModelProperty(value = "鍚皝瀹℃牳浜�") + private String unsealApprovalUser; + /** + * 鍚皝瀹℃牳鏃堕棿 + */ + @Excel(name = "鍚皝瀹℃牳鏃堕棿", width = 15) + @ApiModelProperty(value = "鍚皝瀹℃牳鏃堕棿") + private Date unsealApprovalTime; + /** + * 鍚皝瀹℃牳绫诲瀷 + */ + @Excel(name = "鍚皝瀹℃牳绫诲瀷", width = 15) + @ApiModelProperty(value = "鍚皝瀹℃牳绫诲瀷") + private String unsealApprovalDealType; + /** + * 鍚皝瀹℃牳鎰忚 + */ + @Excel(name = "鍚皝瀹℃牳鎰忚", width = 15) + @ApiModelProperty(value = "鍚皝瀹℃牳鎰忚") + private String unsealApprovalComment; + + + //鍒楄〃灞曠ず + @TableField(exist = false) + private String equipmentCode; + @TableField(exist = false) + private String equipmentName; } -- Gitblit v1.9.3