From 548de3053898bc6571c90d014a40050c39a7d195 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 02 八月 2025 15:33:07 +0800
Subject: [PATCH] 二保添加流转节点
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamEquipmentDto.java | 64 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamEquipmentDto.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamEquipmentDto.java
index 0ff795d..20023b9 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamEquipmentDto.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamEquipmentDto.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.dto;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -82,9 +83,25 @@
private String equipmentName;
/**
+ * 涓績
+ */
+// @Excel(name = "涓績", width = 15, orderNum = "5")
+ @ApiModelProperty(value = "涓績")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ private transient String zxfactoryOrgCode;
+
+ /**
+ * 宸ュ尯
+ */
+// @Excel(name = "宸ュ尯", width = 15, orderNum = "6")
+ @ApiModelProperty(value = "宸ュ尯")
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ private transient String gqfactoryOrgCode;
+
+ /**
* 宸ユ
*/
- @Excel(name = "涓績/宸ュ尯/宸ユ", width = 15, orderNum = "4",dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ @Excel(name = "涓績/宸ュ尯/宸ユ", width = 15, orderNum = "4")
@ApiModelProperty(value = "涓績/宸ュ尯/宸ユ")
@Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "factory_code")
private String factoryOrgCode;
@@ -92,7 +109,7 @@
/**
* 鎵�灞炲垎绫�
*/
- @Excel(name = "鎵�灞炲垎绫�", width = 15, orderNum = "5")
+ @Excel(name = "鎵�灞炲垎绫�", width = 15, orderNum = "5",dicCode = "equipment_category")
@ApiModelProperty(value = "鎵�灞炲垎绫�")
@Dict(dicCode = "equipment_category")
private String equipmentCategory;
@@ -151,8 +168,9 @@
/**
* 鐏伀鍣�
*/
- @Excel(name = "鐏伀鍣�", width = 15, orderNum = "16")
+ @Excel(name = "鐏伀鍣�", width = 15, orderNum = "16",dicCode = "yn")
@ApiModelProperty(value = "鐏伀鍣�")
+ @Dict(dicCode = "yn")
private String fireExtinguisher;
/**
@@ -195,6 +213,12 @@
* 閲嶉噺(鍚�)
*/
@Excel(name = "閲嶉噺(鍚�)", width = 15, orderNum = "22")
+ @ApiModelProperty(value = "閲嶉噺(鍚�)")
+ private String equipmentWeightStr;
+
+ /**
+ * 閲嶉噺(鍚�)
+ */
@ApiModelProperty(value = "閲嶉噺(鍚�)")
private BigDecimal equipmentWeight;
@@ -245,7 +269,7 @@
/**
* 楠屾敹鏃ユ湡
*/
- @Excel(name = "鎶曠敤鏃ユ湡", width = 25, format = "yyyy/MM/dd", orderNum = "29")
+ @Excel(name = "楠屾敹鏃ユ湡", width = 25, format = "yyyy/MM/dd", orderNum = "29")
@ApiModelProperty(value = "楠屾敹鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -296,7 +320,7 @@
/**
* 璐ㄤ繚寮�濮嬫棩鏈�
*/
- @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 15, orderNum = "36")
+ @Excel(name = "璐ㄤ繚寮�濮嬫棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "36")
@ApiModelProperty(value = "璐ㄤ繚寮�濮嬫棩鏈�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -305,7 +329,7 @@
/**
* 璐ㄤ繚缁撴潫鏃ユ湡
*/
- @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 15, orderNum = "37")
+ @Excel(name = "璐ㄤ繚缁撴潫鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "37")
@ApiModelProperty(value = "璐ㄤ繚缁撴潫鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -321,7 +345,7 @@
/**鏈�鏂颁簩淇濇棩鏈�*/
@TableField(exist = false)
- @Excel(name = "鏈�鏂颁簩淇濇棩鏈�", width = 15, orderNum = "39")
+ @Excel(name = "鏈�鏂颁簩淇濇棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "39")
@ApiModelProperty(value = "鏈�鏂颁簩淇濇棩鏈�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -329,7 +353,7 @@
/**涓嬫浜屼繚鏃ユ湡*/
@TableField(exist = false)
- @Excel(name = "涓嬫浜屼繚鏃ユ湡", width = 15, orderNum = "40")
+ @Excel(name = "涓嬫浜屼繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "40")
@ApiModelProperty(value = "涓嬫浜屼繚鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -338,7 +362,7 @@
/**鏈涓変繚鏃ユ湡*/
@TableField(exist = false)
- @Excel(name = "鏈涓変繚鏃ユ湡", width = 15, orderNum = "41")
+ @Excel(name = "鏈涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "41")
@ApiModelProperty(value = "鏈涓変繚鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -346,7 +370,7 @@
/**涓嬫涓変繚鏃ユ湡*/
@TableField(exist = false)
- @Excel(name = "涓嬫涓変繚鏃ユ湡", width = 15, orderNum = "42")
+ @Excel(name = "涓嬫涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "42")
@ApiModelProperty(value = "涓嬫涓変繚鏃ユ湡")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -360,14 +384,14 @@
/**鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�*/
@TableField(exist = false)
- @Excel(name = "鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�", width = 15, orderNum = "44")
+ @Excel(name = "鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "44")
@ApiModelProperty(value = "鏈�鏂版妧鏈姸鎬侀壌瀹氭棩鏈�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private java.util.Date latestTechnologyCheck;
/**鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�*/
@TableField(exist = false)
- @Excel(name = "鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�", width = 15, orderNum = "45")
+ @Excel(name = "鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "45")
@ApiModelProperty(value = "鎶�鏈姸鎬佷笅娆￠壌瀹氭棩鏈�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -410,4 +434,20 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ 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);
+ }
+
+ if(factoryOrgCode.length()==9){
+ this.zxfactoryOrgCode = factoryOrgCode.substring(0,6);
+ }
+
+ }
+ }
+
}
--
Gitblit v1.9.3