From bcd97b6cc18a7d3b608c0b5d01d86496e659de51 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 04 三月 2025 16:45:03 +0800 Subject: [PATCH] art: 所有设备 台账 二保工单 根据设备id查询二保工单,并过滤掉已完成和已取消的二保工单 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PredictiveWorkPlanParameterHistory.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PredictiveWorkPlanParameterHistory.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PredictiveWorkPlanParameterHistory.java index fc8544d..c1b3fe6 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PredictiveWorkPlanParameterHistory.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PredictiveWorkPlanParameterHistory.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecgframework.poi.excel.annotation.Excel; @@ -22,6 +23,8 @@ @Excel(name = "缁存姢鏂规ID", width = 15) @ApiModelProperty(value = "缁存姢鏂规ID") private String workPlanId; + + private String workOrderId; @Excel(name = "鍙傛暟ID", width = 30) @ApiModelProperty(value = "鍙傛暟ID") @@ -47,8 +50,11 @@ @ApiModelProperty(value = "瀹為檯鍊�") private float actualValue; + private String parameterUnit; + @Excel(name = "鏉′欢", width = 15) @ApiModelProperty(value = "鏉′欢") + @Dict(dicCode = "conditional_relation") private String parameterCondition; @Excel(name = "鐩戞祴鏃堕棿", width = 15) -- Gitblit v1.9.3