diff --git a/src/main/java/cn/lihongjie/coal/deviceWorkOrderDetail/dto/DeviceWorkOrderDetailDto.java b/src/main/java/cn/lihongjie/coal/deviceWorkOrderDetail/dto/DeviceWorkOrderDetailDto.java index 74c0c296..d4a6b79f 100644 --- a/src/main/java/cn/lihongjie/coal/deviceWorkOrderDetail/dto/DeviceWorkOrderDetailDto.java +++ b/src/main/java/cn/lihongjie/coal/deviceWorkOrderDetail/dto/DeviceWorkOrderDetailDto.java @@ -1,6 +1,8 @@ package cn.lihongjie.coal.deviceWorkOrderDetail.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.common.DictCode; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import lombok.Data; @@ -18,5 +20,6 @@ public class DeviceWorkOrderDetailDto extends OrgCommonDto { private String archiveStatus; + @DictTranslate(dictKey = DictCode.ARCHIVESTATUS) private String archiveStatusName; } diff --git a/src/main/java/cn/lihongjie/coal/deviceWorkOrderDetail/entity/DeviceWorkOrderDetailEntity.java b/src/main/java/cn/lihongjie/coal/deviceWorkOrderDetail/entity/DeviceWorkOrderDetailEntity.java index 3bc4350e..66cadb9b 100644 --- a/src/main/java/cn/lihongjie/coal/deviceWorkOrderDetail/entity/DeviceWorkOrderDetailEntity.java +++ b/src/main/java/cn/lihongjie/coal/deviceWorkOrderDetail/entity/DeviceWorkOrderDetailEntity.java @@ -10,7 +10,6 @@ import lombok.Data; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.time.LocalDateTime; @@ -37,12 +36,5 @@ public class DeviceWorkOrderDetailEntity extends OrgCommonEntity { @ColumnDefault("'0'") private String archiveStatus = "0"; - @Formula( - "(select i.name\n" - + "from t_dictionary d,\n" - + " t_dictionary_item i\n" - + "where d.id = i.dictionary_id\n" - + " and d.code = 'archiveStatus'\n" - + " and i.code = archive_status)") - private String archiveStatusName; + }