From b463880866cb946b824e989667ff3f0c0faf22f6 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期一, 14 七月 2025 17:09:33 +0800 Subject: [PATCH] art: 我的待办-查询问题修正 --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 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 50091af..4d1e8db 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,5 +1,6 @@ package org.jeecg.modules.eam.entity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -53,26 +54,26 @@ */ @Excel(name = "鏍囧噯ID", width = 15) @ApiModelProperty(value = "鏍囧噯ID") - @Dict(dicCode = "eam_maintenance_standard, standard_name, id") + @Dict(dictTable = "eam_maintenance_standard", dicCode = "id", dicText = "standard_name") private String standardId; /** * 璁″垝淇濆吇鏃ユ湡 */ - @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡") + @ApiModelProperty(value = "璁″垝淇濆吇鏃ユ湡;鎻愬墠70澶╃敓鎴愬伐鍗�") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date maintenanceDate; /** * 閿佸畾宸ュ崟鏃ユ湡 */ - @ApiModelProperty(value = "閿佸畾宸ュ崟鏃ユ湡") + @ApiModelProperty(value = "閿佸畾宸ュ崟鏃ユ湡;鎻愬墠55澶╅攣瀹氬伐鍗�") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date freezeOrderDate; /** * 宸ュ崟杩囨湡鏃ユ湡 */ - @ApiModelProperty(value = "宸ュ崟杩囨湡鏃ユ湡") + @ApiModelProperty(value = "宸ュ崟杩囨湡鏃ユ湡;鍒版湡鏈仛鐩存帴杩囨湡") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date orderExpirationDate; @@ -103,7 +104,7 @@ * 淇濆吇鐘舵�� */ @Excel(name = "淇濆吇鐘舵��", width = 15) - @ApiModelProperty(value = "淇濆吇鐘舵��") + @ApiModelProperty(value = "淇濆吇鐘舵��;寰呬繚鍏汇�佷繚鍏讳腑銆佸緟妫�鏌ャ�佹搷浣滀汉绛惧瓧銆佺淮淇汉绛惧瓧銆佺淮淇涓讳换绛惧瓧銆佽澶囨鏌ヤ汉绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡鍙栨秷") @Dict(dicCode = "third_maintenance_status") private String maintenanceStatus; /** @@ -113,13 +114,6 @@ @ApiModelProperty(value = "鍒涘缓鏂瑰紡") @Dict(dicCode = "order_creation_method") private String creationMethod; - /** - * 淇濆吇浜� - */ - @Excel(name = "淇濆吇浜�", width = 15) - @ApiModelProperty(value = "淇濆吇浜�") - @Dict(dicCode = "sys_user, realname, username") - private String operator; /** * 璁惧鍔熻兘鏄惁榻愬;鏄惁 */ -- Gitblit v1.9.3