From 1a453a25e7b39f11734efde9aeb049028d9eedc9 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Thu, 18 Apr 2024 16:04:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/DeviceWorkOrderDto.java               | 28 ++++---------------
 .../entity/DeviceWorkOrderEntity.java         | 27 ++----------------
 2 files changed, 7 insertions(+), 48 deletions(-)

diff --git a/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/DeviceWorkOrderDto.java b/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/DeviceWorkOrderDto.java
index 64ea0cc7..4f454eac 100644
--- a/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/DeviceWorkOrderDto.java
+++ b/src/main/java/cn/lihongjie/coal/deviceWorkOrder/dto/DeviceWorkOrderDto.java
@@ -1,8 +1,10 @@
 package cn.lihongjie.coal.deviceWorkOrder.dto;
 
 import cn.lihongjie.coal.base.dto.OrgCommonDto;
+import cn.lihongjie.coal.common.DictCode;
 import cn.lihongjie.coal.device.entity.DeviceEntity;
 import cn.lihongjie.coal.deviceWorkOrderDetail.dto.DeviceWorkOrderDetailDto;
+import cn.lihongjie.coal.pojoProcessor.DictTranslate;
 import cn.lihongjie.coal.user.entity.UserEntity;
 
 import jakarta.persistence.ManyToOne;
@@ -12,7 +14,6 @@ import lombok.Data;
 
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Comment;
-import org.hibernate.annotations.Formula;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -36,41 +37,22 @@ public class DeviceWorkOrderDto extends OrgCommonDto {
     @Comment("工单类型")
     private String type;
 
-    @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 = 'device.workOrder.type'\n"
-            + "  and i.code = type)")
+    @DictTranslate(dictKey =  DictCode.DEVICE_WORKORDER_TYPE)
     private String typeName;
 
     @Comment("工单状态")
     private String orderStatus;
 
-    @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 = 'device.workOrder.status'\n"
-            + "  and i.code = order_status)")
+    @DictTranslate(dictKey =  DictCode.DEVICE_WORKORDER_STATUS)
     private String orderStatusName;
 
     @Comment("归档状态")
     @ColumnDefault("'0'")
     private String archiveStatus;
 
-    @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)")
+    @DictTranslate(dictKey = DictCode.ARCHIVESTATUS)
     private String archiveStatusName;
 
-
     private List<DeviceWorkOrderDetailDto> details;
 
 
diff --git a/src/main/java/cn/lihongjie/coal/deviceWorkOrder/entity/DeviceWorkOrderEntity.java b/src/main/java/cn/lihongjie/coal/deviceWorkOrder/entity/DeviceWorkOrderEntity.java
index 1b92bdd2..2024c259 100644
--- a/src/main/java/cn/lihongjie/coal/deviceWorkOrder/entity/DeviceWorkOrderEntity.java
+++ b/src/main/java/cn/lihongjie/coal/deviceWorkOrder/entity/DeviceWorkOrderEntity.java
@@ -14,7 +14,6 @@ import lombok.Data;
 
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.Comment;
-import org.hibernate.annotations.Formula;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -41,39 +40,17 @@ public class DeviceWorkOrderEntity extends OrgCommonEntity {
     @Comment("工单类型")
     private String type;
 
-    @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 = 'device.workOrder.type'\n"
-                    + "  and i.code = type)")
-    private String typeName;
 
     @Comment("工单状态")
     private String orderStatus;
 
-    @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 = 'device.workOrder.status'\n"
-                    + "  and i.code = order_status)")
-    private String orderStatusName;
+
 
     @Comment("归档状态")
     @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;
+
 
 
     @OneToMany(mappedBy = "workOrder", cascade = {CascadeType.ALL})