From ce3f55e4daea0640fd5065b8e655c3b177e79b9b Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 25 八月 2025 15:55:22 +0800
Subject: [PATCH] 设备管理首页列表接口
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java | 72 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
index 4d1e8db..157037a 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
+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;
@@ -62,7 +63,8 @@
@ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡;鎻愬墠70澶╃敓鎴愬伐鍗�")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date maintenanceDate;
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private String maintenanceDate;
/**
* 閿佸畾宸ュ崟鏃ユ湡
*/
@@ -98,7 +100,7 @@
*/
@Excel(name = "缁翠慨浜�", width = 15)
@ApiModelProperty(value = "缁翠慨浜�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairman;
/**
* 淇濆吇鐘舵��
@@ -119,12 +121,14 @@
*/
@Excel(name = "璁惧鍔熻兘鏄惁榻愬;鏄惁", width = 15)
@ApiModelProperty(value = "璁惧鍔熻兘鏄惁榻愬;鏄惁")
+ @Dict(dicCode = "yn")
private String fullyFunctional;
/**
* 璁惧鍔熻兘鏄惁榻愬;鏄惁
*/
@Excel(name = "璁惧鑳藉惁姝ｅ父杩愯浆;鏄惁", width = 15)
@ApiModelProperty(value = "璁惧鍔熻兘鏄惁榻愬;鏄惁")
+ @Dict(dicCode = "yn")
private String runningNormally;
/**
* 闂鎻忚堪
@@ -137,7 +141,7 @@
*/
@Excel(name = "妫�鏌ヤ汉", width = 15)
@ApiModelProperty(value = "妫�鏌ヤ汉")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String inspector;
/**
* 妫�鏌ユ椂闂�
@@ -152,14 +156,13 @@
*/
@Excel(name = "鎿嶄綔浜虹瀛�", width = 15)
@ApiModelProperty(value = "鎿嶄綔浜虹瀛�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String operatorSignature;
/**
* 鍗忓姪鎿嶄綔浜�
*/
@Excel(name = "鍗忓姪鎿嶄綔浜�", width = 15)
@ApiModelProperty(value = "鍗忓姪鎿嶄綔浜�")
- @Dict(dicCode = "sys_user, realname, username")
private String assistantOperator;
/**
* 鎿嶄綔浜虹瀛楁椂闂�
@@ -174,14 +177,13 @@
*/
@Excel(name = "缁翠慨浜虹瀛�", width = 15)
@ApiModelProperty(value = "缁翠慨浜虹瀛�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairmanSignature;
/**
* 鍗忓姪缁翠慨浜�
*/
@Excel(name = "鍗忓姪缁翠慨浜�", width = 15)
@ApiModelProperty(value = "鍗忓姪缁翠慨浜�")
- @Dict(dicCode = "sys_user, realname, username")
private String assistantRepairman;
/**
* 缁翠慨浜虹瀛楁椂闂�
@@ -196,7 +198,7 @@
*/
@Excel(name = "缁翠慨瀹や富浠荤瀛�", width = 15)
@ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛�")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairManagerSignature;
/**
* 缁翠慨瀹や富浠荤瀛楁椂闂�
@@ -211,7 +213,7 @@
*/
@Excel(name = "璁惧妫�鏌ヤ汉绛惧瓧", width = 15)
@ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧")
- @Dict(dicCode = "sys_user, realname, username")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String inspectorSignature;
/**
* 璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿
@@ -244,4 +246,54 @@
private String equipmentCode;
@TableField(exist = false)
private String equipmentName;
+ @TableField(exist = false)
+ private String equipmentModel;
+ //娴佽浆鑺傜偣浣跨敤鏌ヨ
+ @TableField(exist = false)
+ private String procInstId;
+ /**娴佺▼瀹氫箟key 涓�涓猭ey浼氭湁澶氫釜鐗堟湰鐨刬d*/
+ @TableField(exist = false)
+ private String processDefinitionKey;
+ /**娴佺▼瀹氫箟id 涓�涓祦绋嬪畾涔夊敮涓�*/
+ @TableField(exist = false)
+ private String processDefinitionId;
+ /**娴佺▼涓氬姟瀹炰緥id 涓�涓祦绋嬩笟鍔″敮涓�锛屾湰琛ㄤ腑涔熷敮涓�*/
+ @TableField(exist = false)
+ private String processInstanceId;
+
+ /**鎶�鏈姸鎬�*/
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鎶�鏈姸鎬�")
+ @Dict(dicCode = "equipment_technology_status")
+ private String technologyStatus;
+
+ @ApiModelProperty(value = "涓績")
+ @TableField(exist = false)
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ private transient String zxfactoryOrgCode;
+
+ @ApiModelProperty(value = "宸ュ尯")
+ @TableField(exist = false)
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code")
+ private transient String gqfactoryOrgCode;
+
+ @ApiModelProperty(value = "涓績/宸ュ尯/宸ユ")
+ @TableField(exist = false)
+ @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "factory_code")
+ 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);
+ }
+
+ if(factoryOrgCode.length()==9){
+ this.zxfactoryOrgCode = factoryOrgCode.substring(0,6);
+ }
+
+ }
+ }
}
--
Gitblit v1.9.3