lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 07:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
lihongjie0209
2024-04-18 15:28:14 +08:00
parent e137482b53
commit 4daa801281
4 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/cn/lihongjie/coal/device/dto/DeviceDto.java
View File

@@ -1,7 +1,9 @@
package cn.lihongjie.coal.device.dto;
import cn.lihongjie.coal.base.dto.OrgCommonDto;
import cn.lihongjie.coal.common.DictCode;
import cn.lihongjie.coal.deviceCategory.dto.DeviceCategoryDto;
import cn.lihongjie.coal.pojoProcessor.DictTranslate;
import cn.lihongjie.coal.user.dto.UserDto;
import jakarta.persistence.ManyToOne;
@@ -10,7 +12,6 @@ import lombok.Data;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.Formula;
@Data
public class DeviceDto extends OrgCommonDto {
@@ -51,14 +52,6 @@ public class DeviceDto extends OrgCommonDto {
@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;
}

9
src/main/java/cn/lihongjie/coal/device/entity/DeviceEntity.java
View File

@@ -12,7 +12,6 @@ import lombok.Data;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.Formula;
@Data
@Entity
@@ -57,12 +56,4 @@ public class DeviceEntity extends OrgCommonEntity {
@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;
}

3
src/main/java/cn/lihongjie/coal/deviceSupplier/dto/DeviceSupplierDto.java
View File

@@ -1,6 +1,8 @@
package cn.lihongjie.coal.deviceSupplier.dto;
import cn.lihongjie.coal.base.dto.OrgCommonDto;
import cn.lihongjie.coal.common.DictCode;
import cn.lihongjie.coal.pojoProcessor.DictTranslate;
import lombok.Data;
@@ -8,6 +10,7 @@ import lombok.Data;
public class DeviceSupplierDto extends OrgCommonDto {
private String archiveStatus;
@DictTranslate(dictKey = DictCode.ARCHIVESTATUS)
private String archiveStatusName;
private String contact;

10
src/main/java/cn/lihongjie/coal/deviceSupplier/entity/DeviceSupplierEntity.java
View File

@@ -8,7 +8,6 @@ import lombok.Data;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.Comment;
import org.hibernate.annotations.Formula;
@Data
@Entity
@@ -17,14 +16,7 @@ public class DeviceSupplierEntity 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;