From 0d06048c5d560e301bf17fad476975c8ffffcb56 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 05 九月 2025 16:07:31 +0800
Subject: [PATCH] 添加三级保养工作计划单生成规则
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceFurnace.java | 96 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 90 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceFurnace.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceFurnace.java
index f1de276..509cf1d 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceFurnace.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceFurnace.java
@@ -1,5 +1,8 @@
package org.jeecg.modules.eam.entity;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -29,7 +32,12 @@
public class EamThirdMaintenanceFurnace extends JeecgEntity implements Serializable {
private static final long serialVersionUID = -5799611070364065336L;
-
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
/**
* 鍒犻櫎鏍囪
*/
@@ -42,6 +50,19 @@
@Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
+ /**
+ * 宸ュ崟鍙�
+ */
+ @Excel(name = "宸ュ崟鍙�", width = 15)
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String orderNum;
+ /**
+ * 璁″垝淇濆吇鏃ユ湡
+ */
+ @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡;鎻愬墠70澶╃敓鎴愬伐鍗�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date maintenanceDate;
/**
* 鍘嬬缉绌烘皵鍘嬪姏(MPa)
*/
@@ -83,13 +104,13 @@
*/
@Excel(name = "淇濆吇浜�", width = 15)
@ApiModelProperty(value = "淇濆吇浜�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String operator;
/**
- * 淇濆吇鏃ユ湡
+ * 淇濆吇鏃堕棿
*/
- @ApiModelProperty(value = "淇濆吇鏃ユ湡")
- @Excel(name = "淇濆吇鏃ユ湡", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "淇濆吇鏃堕棿")
+ @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")
private Date operateTime;
@@ -98,6 +119,7 @@
*/
@Excel(name = "淇濆吇鐘舵��;寰呮彁浜ゃ�佸緟纭銆佸凡瀹屾垚", width = 15)
@ApiModelProperty(value = "淇濆吇鐘舵��;寰呮彁浜ゃ�佸緟纭銆佸凡瀹屾垚")
+ @Dict(dicCode = "third_maintenance_furnace_status")
private String maintenanceStatus;
/**
* 鑳藉惁婊¤冻鍔犲伐闇�姹�;鏄惁
@@ -110,8 +132,11 @@
*/
@Excel(name = "纭浜�", width = 15)
@ApiModelProperty(value = "纭浜�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String confirmUser;
+ /** 纭绫诲瀷 1 閫氳繃 2 椹冲洖 */
+ @ApiModelProperty(value = "纭绫诲瀷")
+ private String confirmDealType;
/**
* 纭鏃ユ湡
*/
@@ -126,4 +151,63 @@
@Excel(name = "HF缂栫爜", width = 15)
@ApiModelProperty(value = "HF缂栫爜")
private String hfCode;
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+ @TableField(exist = false)
+ private String equipmentModel;
+
+ /**
+ * 鍏徃
+ */
+ @ApiModelProperty(value = "鍏徃")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @TableField(exist = false)
+ private transient String gsfactoryOrgCode;
+
+ /**
+ * 涓績
+ */
+ @ApiModelProperty(value = "涓績")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @TableField(exist = false)
+ private transient String zxfactoryOrgCode;
+
+ /**
+ * 宸ュ尯
+ */
+ @ApiModelProperty(value = "宸ュ尯")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @TableField(exist = false)
+ private transient String gqfactoryOrgCode;
+
+ /**
+ * 宸ユ
+ */
+ @ApiModelProperty(value = "涓績/宸ュ尯/宸ユ")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @TableField(exist = false)
+ private String factoryOrgCode;
+
+ public void setFactoryOrgCode(String factoryOrgCode){
+ this.factoryOrgCode = factoryOrgCode;
+ if(StrUtil.isNotEmpty(factoryOrgCode)){
+ if(factoryOrgCode.length()==12){
+ this.gqfactoryOrgCode = factoryOrgCode.substring(0,9);
+ this.zxfactoryOrgCode = factoryOrgCode.substring(0,6);
+ this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+ }
+
+ if(factoryOrgCode.length()==9){
+ this.zxfactoryOrgCode = factoryOrgCode.substring(0,6);
+ this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+ }
+
+ if(factoryOrgCode.length()==6){
+ this.gsfactoryOrgCode = factoryOrgCode.substring(0,3);
+ }
+ }
+ }
}
--
Gitblit v1.9.3