This commit is contained in:
2024-04-18 16:18:13 +08:00
parent 884ee16a8e
commit 0542d4fb4d
2 changed files with 4 additions and 9 deletions

View File

@@ -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;
}

View File

@@ -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;
}