From 3bd836da728986edbcbca1eadf6bada2940ac256 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Thu, 18 Apr 2024 17:03: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/EmDeviceSupplierDto.java | 3 ++ .../entity/EmDeviceSupplierEntity.java | 10 +--- .../coal/empSalary/dto/EmpSalaryDto.java | 3 ++ .../empSalary/entity/EmpSalaryEntity.java | 9 ---- .../entity/EmpSalaryBatchEntity.java | 10 +--- .../empSalaryItem/dto/EmpSalaryItemDto.java | 22 ++------ .../entity/EmpSalaryItemEntity.java | 21 +------- .../dto/EmpSalaryItemConfigDto.java | 13 ++--- .../entity/EmpSalaryItemConfigEntity.java | 10 +--- .../coal/employee/dto/EmployeeDto.java | 16 +++--- .../coal/employee/entity/EmployeeEntity.java | 54 ++----------------- .../employeeRecord/dto/EmployeeRecordDto.java | 14 ++--- .../entity/EmployeeRecordEntity.java | 19 +------ .../inventoryCheck/dto/InventoryCheckDto.java | 12 ++--- .../entity/InventoryCheckEntity.java | 9 +--- .../lihongjie/coal/notice/dto/NoticeDto.java | 11 ++-- .../coal/notice/entity/NoticeEntity.java | 9 ---- .../pdfGenerator/dto/PdfGeneratorDto.java | 9 ++++ .../entity/PdfGeneratorEntity.java | 10 +--- .../coal/product/dto/ProductDto.java | 11 ++-- .../coal/product/entity/ProductEntity.java | 10 +--- .../purchaseOrder/dto/PurchaseOrderDto.java | 17 ++---- .../entity/PurchaseOrderEntity.java | 9 +--- 23 files changed, 64 insertions(+), 247 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/EmDeviceSupplierDto.java b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/EmDeviceSupplierDto.java index e5342572..e1c06fb4 100644 --- a/src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/EmDeviceSupplierDto.java +++ b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/dto/EmDeviceSupplierDto.java @@ -1,6 +1,8 @@ package cn.lihongjie.coal.emDeviceSupplier.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.common.DictCode; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import lombok.Data; @@ -14,5 +16,6 @@ public class EmDeviceSupplierDto extends OrgCommonDto { private String address; private String archiveStatus; + @DictTranslate(dictKey = DictCode.ARCHIVESTATUS) private String archiveStatusName; } diff --git a/src/main/java/cn/lihongjie/coal/emDeviceSupplier/entity/EmDeviceSupplierEntity.java b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/entity/EmDeviceSupplierEntity.java index f9dc4975..4aa8cacb 100644 --- a/src/main/java/cn/lihongjie/coal/emDeviceSupplier/entity/EmDeviceSupplierEntity.java +++ b/src/main/java/cn/lihongjie/coal/emDeviceSupplier/entity/EmDeviceSupplierEntity.java @@ -8,7 +8,6 @@ import lombok.Data; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data @Entity @@ -22,12 +21,5 @@ public class EmDeviceSupplierEntity 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; + } diff --git a/src/main/java/cn/lihongjie/coal/empSalary/dto/EmpSalaryDto.java b/src/main/java/cn/lihongjie/coal/empSalary/dto/EmpSalaryDto.java index 39c92f7c..e0c033e8 100644 --- a/src/main/java/cn/lihongjie/coal/empSalary/dto/EmpSalaryDto.java +++ b/src/main/java/cn/lihongjie/coal/empSalary/dto/EmpSalaryDto.java @@ -1,8 +1,10 @@ package cn.lihongjie.coal.empSalary.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.common.DictCode; import cn.lihongjie.coal.empSalaryBatch.dto.EmpSalaryBatchDto; import cn.lihongjie.coal.employee.dto.EmployeeDto; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import jakarta.persistence.ManyToOne; @@ -16,6 +18,7 @@ import java.math.BigDecimal; public class EmpSalaryDto extends OrgCommonDto { private String archiveStatus; + @DictTranslate(dictKey = DictCode.ARCHIVESTATUS) private String archiveStatusName; @ManyToOne diff --git a/src/main/java/cn/lihongjie/coal/empSalary/entity/EmpSalaryEntity.java b/src/main/java/cn/lihongjie/coal/empSalary/entity/EmpSalaryEntity.java index cee7d1af..726b314e 100644 --- a/src/main/java/cn/lihongjie/coal/empSalary/entity/EmpSalaryEntity.java +++ b/src/main/java/cn/lihongjie/coal/empSalary/entity/EmpSalaryEntity.java @@ -11,7 +11,6 @@ import lombok.Data; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.math.BigDecimal; @@ -92,12 +91,4 @@ public class EmpSalaryEntity 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; } diff --git a/src/main/java/cn/lihongjie/coal/empSalaryBatch/entity/EmpSalaryBatchEntity.java b/src/main/java/cn/lihongjie/coal/empSalaryBatch/entity/EmpSalaryBatchEntity.java index 8957999b..bbf5e6d3 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryBatch/entity/EmpSalaryBatchEntity.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryBatch/entity/EmpSalaryBatchEntity.java @@ -8,7 +8,6 @@ import lombok.Data; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.time.LocalDate; @@ -26,12 +25,5 @@ public class EmpSalaryBatchEntity 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; + } diff --git a/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/EmpSalaryItemDto.java b/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/EmpSalaryItemDto.java index 27f4381b..80efe8b9 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/EmpSalaryItemDto.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/EmpSalaryItemDto.java @@ -1,11 +1,12 @@ package cn.lihongjie.coal.empSalaryItem.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.common.DictCode; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.util.List; @@ -26,27 +27,14 @@ public class EmpSalaryItemDto extends OrgCommonDto { @Comment("工资项目类型") private String itemType; - @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 = 'salaryItem.type'\n" - + " and i.code = item_type)") - // @Comment("工资项目类型-名称") + @DictTranslate(dictKey = DictCode.SALARYITEM_TYPE) private String itemTypeName; @Comment("工资项目录入方式") private String inputType; - @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 = 'salaryItem.inputType'\n" - + " and i.code = input_type)") - // @Comment("工资项目录入方式-名称") + + @DictTranslate(dictKey = DictCode.SALARYITEM_INPUTTYPE) private String inputTypeName; @Comment("公式-显示") diff --git a/src/main/java/cn/lihongjie/coal/empSalaryItem/entity/EmpSalaryItemEntity.java b/src/main/java/cn/lihongjie/coal/empSalaryItem/entity/EmpSalaryItemEntity.java index b0aadeeb..0fbd630a 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItem/entity/EmpSalaryItemEntity.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItem/entity/EmpSalaryItemEntity.java @@ -7,7 +7,6 @@ import jakarta.persistence.Entity; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.util.List; @@ -27,28 +26,12 @@ public class EmpSalaryItemEntity extends OrgCommonEntity { @Comment("工资项目类型") private String itemType; - @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 = 'salaryItem.type'\n" - + " and i.code = item_type)") - // @Comment("工资项目类型-名称") - private String itemTypeName; + @Comment("工资项目录入方式") private String inputType; - @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 = 'salaryItem.inputType'\n" - + " and i.code = input_type)") - // @Comment("工资项目录入方式-名称") - private String inputTypeName; + @Comment("公式-显示") private String formulaShow; diff --git a/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/dto/EmpSalaryItemConfigDto.java b/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/dto/EmpSalaryItemConfigDto.java index 49922561..33a7acfe 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/dto/EmpSalaryItemConfigDto.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/dto/EmpSalaryItemConfigDto.java @@ -2,11 +2,12 @@ package cn.lihongjie.coal.empSalaryItemConfig.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.common.DictCode; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data public class EmpSalaryItemConfigDto extends OrgCommonDto { @@ -14,17 +15,9 @@ public class EmpSalaryItemConfigDto extends OrgCommonDto { @Comment("类别") private String itemType; - @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 = 'emp.salary.item.config.type'\n" - + " and i.code = item_type)") + @DictTranslate(dictKey = DictCode.EMP_SALARY_ITEM_CONFIG_TYPE) private String itemTypeName; - - @Comment("表达式") private String expression; diff --git a/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/entity/EmpSalaryItemConfigEntity.java b/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/entity/EmpSalaryItemConfigEntity.java index 5b642d1a..253bb87f 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/entity/EmpSalaryItemConfigEntity.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/entity/EmpSalaryItemConfigEntity.java @@ -8,7 +8,6 @@ import jakarta.persistence.Entity; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data @Entity @@ -17,14 +16,7 @@ public class EmpSalaryItemConfigEntity extends OrgCommonEntity { @Comment("类别") private String itemType; - @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 = 'emp.salary.item.config.type'\n" - + " and i.code = item_type)") - private String itemTypeName; + diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java index 5356da35..622e4a77 100644 --- a/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java +++ b/src/main/java/cn/lihongjie/coal/employee/dto/EmployeeDto.java @@ -1,12 +1,14 @@ package cn.lihongjie.coal.employee.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.common.DictCode; import cn.lihongjie.coal.department.dto.DepartmentDto; import cn.lihongjie.coal.employee.entity.EmpCarVO; import cn.lihongjie.coal.employee.entity.EmpCertVO; import cn.lihongjie.coal.employee.entity.EmpFamilyMemberVO; import cn.lihongjie.coal.file.entity.FileEntity; import cn.lihongjie.coal.jobPost.dto.JobPostDto; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import jakarta.persistence.ElementCollection; import jakarta.persistence.ManyToOne; @@ -15,7 +17,6 @@ import jakarta.persistence.OneToMany; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.time.LocalDate; import java.util.List; @@ -26,18 +27,21 @@ public class EmployeeDto extends OrgCommonDto { private String sex; @Comment("性别-名称") + @DictTranslate(dictKey = DictCode.SEX) private String sexName; @Comment("民族") private String nation; @Comment("民族-名称") + @DictTranslate(dictKey = DictCode.NATION) private String nationName; @Comment("婚姻状况") private String marriage; @Comment("婚姻状况-名称") + @DictTranslate(dictKey = DictCode.MARRIAGE) private String marriageName; @Comment("入职时间") @@ -50,6 +54,7 @@ public class EmployeeDto extends OrgCommonDto { private String education; @Comment("学历-名称") + @DictTranslate(dictKey = DictCode.EDUCATION) private String educationName; @Comment("毕业学校") @@ -86,6 +91,7 @@ public class EmployeeDto extends OrgCommonDto { @Comment("银行编码") private String bank; + @DictTranslate(dictKey = DictCode.BANK) private String bankName; @Comment("银行卡号") @@ -105,13 +111,7 @@ public class EmployeeDto extends OrgCommonDto { @Comment("员工状态") private String empStatus; - @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 = 'emp.status'\n" - + " and i.code = emp_status)") + @DictTranslate(dictKey = DictCode.EMP_STATUS) private String empStatusName; @Comment("家庭成员") diff --git a/src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java b/src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java index 7bdc158e..cde4dc0b 100644 --- a/src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java +++ b/src/main/java/cn/lihongjie/coal/employee/entity/EmployeeEntity.java @@ -10,7 +10,6 @@ import jakarta.persistence.*; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.time.LocalDate; import java.util.List; @@ -22,38 +21,16 @@ public class EmployeeEntity extends OrgCommonEntity { @Comment("性别") private String sex; - @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 = 'sex'\n" - + " and i.code = sex)") - private String sexName; + @Comment("民族") private String nation; - @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 = 'nation'\n" - + " and i.code = nation)") - private String nationName; @Comment("婚姻状况") private String marriage; - @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 = 'marriage'\n" - + " and i.code = marriage)") - private String marriageName; + @Comment("入职时间") private LocalDate entryDate; @@ -72,14 +49,7 @@ public class EmployeeEntity extends OrgCommonEntity { @Comment("学历") private String education; - @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 = 'education'\n" - + " and i.code = education)") - private String educationName; + @Comment("毕业学校") private String school; @@ -115,14 +85,7 @@ public class EmployeeEntity extends OrgCommonEntity { @Comment("银行编码") private String bank; - @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 = 'bank'\n" - + " and i.code = bank)") - private String bankName; + @Comment("银行卡号") private String bankCardNumber; @@ -133,14 +96,7 @@ public class EmployeeEntity extends OrgCommonEntity { @Comment("员工状态") private String empStatus; - @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 = 'emp.status'\n" - + " and i.code = emp_status)") - private String empStatusName; + diff --git a/src/main/java/cn/lihongjie/coal/employeeRecord/dto/EmployeeRecordDto.java b/src/main/java/cn/lihongjie/coal/employeeRecord/dto/EmployeeRecordDto.java index 151f52f0..51107293 100644 --- a/src/main/java/cn/lihongjie/coal/employeeRecord/dto/EmployeeRecordDto.java +++ b/src/main/java/cn/lihongjie/coal/employeeRecord/dto/EmployeeRecordDto.java @@ -1,12 +1,13 @@ package cn.lihongjie.coal.employeeRecord.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.common.DictCode; import cn.lihongjie.coal.employee.dto.EmployeeDto; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data public class EmployeeRecordDto extends OrgCommonDto { @@ -20,17 +21,9 @@ public class EmployeeRecordDto extends OrgCommonDto { @Comment("记录类型") private String recordType; - @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 = 'emp.record.type'\n" - + " and i.code = record_type)") + @DictTranslate(dictKey = DictCode.EMP_RECORD_TYPE) private String recordTypeName; - - @Comment("记录内容") private String recordContent; @@ -42,5 +35,6 @@ public class EmployeeRecordDto extends OrgCommonDto { private Double money; private String archiveStatus; + @DictTranslate(dictKey = DictCode.ARCHIVESTATUS) private String archiveStatusName; } diff --git a/src/main/java/cn/lihongjie/coal/employeeRecord/entity/EmployeeRecordEntity.java b/src/main/java/cn/lihongjie/coal/employeeRecord/entity/EmployeeRecordEntity.java index 490dd7d0..70dde0ad 100644 --- a/src/main/java/cn/lihongjie/coal/employeeRecord/entity/EmployeeRecordEntity.java +++ b/src/main/java/cn/lihongjie/coal/employeeRecord/entity/EmployeeRecordEntity.java @@ -10,7 +10,6 @@ import lombok.Data; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data @Entity @@ -27,14 +26,7 @@ public class EmployeeRecordEntity extends OrgCommonEntity { @Comment("记录类型") private String recordType; - @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 = 'emp.record.type'\n" - + " and i.code = record_type)") - private String recordTypeName; + @@ -54,14 +46,7 @@ public class EmployeeRecordEntity 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; + diff --git a/src/main/java/cn/lihongjie/coal/inventoryCheck/dto/InventoryCheckDto.java b/src/main/java/cn/lihongjie/coal/inventoryCheck/dto/InventoryCheckDto.java index bb04d15f..b4056812 100644 --- a/src/main/java/cn/lihongjie/coal/inventoryCheck/dto/InventoryCheckDto.java +++ b/src/main/java/cn/lihongjie/coal/inventoryCheck/dto/InventoryCheckDto.java @@ -1,11 +1,12 @@ package cn.lihongjie.coal.inventoryCheck.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.common.DictCode; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.time.LocalDateTime; @@ -17,14 +18,9 @@ public class InventoryCheckDto extends OrgCommonDto { @Comment("盘点类型") private String checkType; - @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 = 'inventoryCheck.type'\n" - + " and i.code = check_type)") + @Comment("盘点类型-名称") + @DictTranslate(dictKey = DictCode.INVENTORYCHECK_TYPE) private String checkTypeName; /** diff --git a/src/main/java/cn/lihongjie/coal/inventoryCheck/entity/InventoryCheckEntity.java b/src/main/java/cn/lihongjie/coal/inventoryCheck/entity/InventoryCheckEntity.java index a3fc55bf..d1489c0c 100644 --- a/src/main/java/cn/lihongjie/coal/inventoryCheck/entity/InventoryCheckEntity.java +++ b/src/main/java/cn/lihongjie/coal/inventoryCheck/entity/InventoryCheckEntity.java @@ -20,14 +20,7 @@ public class InventoryCheckEntity extends OrgCommonEntity { @Comment("盘点类型") private String checkType; - @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 = 'inventoryCheck.type'\n" - + " and i.code = check_type)") - private String checkTypeName; + /** 精煤 合计 */ @Formula( diff --git a/src/main/java/cn/lihongjie/coal/notice/dto/NoticeDto.java b/src/main/java/cn/lihongjie/coal/notice/dto/NoticeDto.java index 648b07d1..d8ca9f34 100644 --- a/src/main/java/cn/lihongjie/coal/notice/dto/NoticeDto.java +++ b/src/main/java/cn/lihongjie/coal/notice/dto/NoticeDto.java @@ -1,11 +1,12 @@ package cn.lihongjie.coal.notice.dto; import cn.lihongjie.coal.base.dto.CommonDto; +import cn.lihongjie.coal.common.DictCode; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data public class NoticeDto extends CommonDto { @@ -16,13 +17,7 @@ public class NoticeDto extends CommonDto { @Comment("内容类型 0 html 1 markdown") private String contentType; - @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 = 'notebook.contentType'\n" - + " and i.code = content_type)") + @DictTranslate(dictKey = DictCode.NOTEBOOK_CONTENTTYPE) private String contentTypeName; @Comment("内容") diff --git a/src/main/java/cn/lihongjie/coal/notice/entity/NoticeEntity.java b/src/main/java/cn/lihongjie/coal/notice/entity/NoticeEntity.java index 3272abde..1b8739f4 100644 --- a/src/main/java/cn/lihongjie/coal/notice/entity/NoticeEntity.java +++ b/src/main/java/cn/lihongjie/coal/notice/entity/NoticeEntity.java @@ -8,7 +8,6 @@ import jakarta.persistence.*; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.util.List; @@ -22,14 +21,6 @@ public class NoticeEntity extends CommonEntity { @Comment("内容类型 0 html 1 markdown") private String contentType; - @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 = 'notebook.contentType'\n" - + " and i.code = content_type)") - private String contentTypeName; @Comment("内容") private String content; diff --git a/src/main/java/cn/lihongjie/coal/pdfGenerator/dto/PdfGeneratorDto.java b/src/main/java/cn/lihongjie/coal/pdfGenerator/dto/PdfGeneratorDto.java index 692c71c3..659d4d4f 100644 --- a/src/main/java/cn/lihongjie/coal/pdfGenerator/dto/PdfGeneratorDto.java +++ b/src/main/java/cn/lihongjie/coal/pdfGenerator/dto/PdfGeneratorDto.java @@ -1,9 +1,13 @@ package cn.lihongjie.coal.pdfGenerator.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.common.DictCode; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import lombok.Data; +import org.hibernate.annotations.Comment; + import java.time.LocalDateTime; @Data @@ -25,4 +29,9 @@ public class PdfGeneratorDto extends OrgCommonDto { private String options; + @Comment("生成状态") + private String execStatus; + + @DictTranslate(dictKey = DictCode.COMMON_EXECSTATUS) + private String execStatusName; } diff --git a/src/main/java/cn/lihongjie/coal/pdfGenerator/entity/PdfGeneratorEntity.java b/src/main/java/cn/lihongjie/coal/pdfGenerator/entity/PdfGeneratorEntity.java index 521903b7..9af88842 100644 --- a/src/main/java/cn/lihongjie/coal/pdfGenerator/entity/PdfGeneratorEntity.java +++ b/src/main/java/cn/lihongjie/coal/pdfGenerator/entity/PdfGeneratorEntity.java @@ -7,7 +7,6 @@ import jakarta.persistence.Entity; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.time.LocalDateTime; @@ -35,12 +34,5 @@ public class PdfGeneratorEntity extends OrgCommonEntity { @Comment("生成状态") private String execStatus; - @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 = 'common.execStatus'\n" - + " and i.code = exec_status)") - private String execStatusName; + } diff --git a/src/main/java/cn/lihongjie/coal/product/dto/ProductDto.java b/src/main/java/cn/lihongjie/coal/product/dto/ProductDto.java index d13f5043..c52c0810 100644 --- a/src/main/java/cn/lihongjie/coal/product/dto/ProductDto.java +++ b/src/main/java/cn/lihongjie/coal/product/dto/ProductDto.java @@ -1,23 +1,18 @@ package cn.lihongjie.coal.product.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import cn.lihongjie.coal.common.DictCode; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data public class ProductDto extends OrgCommonDto { @Comment("煤源类型") private String coalType; - @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 = 'coal.type'\n" - + " and i.code = coal_type)") + @DictTranslate(dictKey = DictCode.COAL_TYPE) private String coalTypeName; } diff --git a/src/main/java/cn/lihongjie/coal/product/entity/ProductEntity.java b/src/main/java/cn/lihongjie/coal/product/entity/ProductEntity.java index 202b66a4..1b16975f 100644 --- a/src/main/java/cn/lihongjie/coal/product/entity/ProductEntity.java +++ b/src/main/java/cn/lihongjie/coal/product/entity/ProductEntity.java @@ -7,7 +7,6 @@ import jakarta.persistence.Entity; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data @Entity @@ -17,13 +16,6 @@ public class ProductEntity extends OrgCommonEntity { @Comment("煤源类型") private String coalType; - @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 = 'coal.type'\n" - + " and i.code = coal_type)") - private String coalTypeName; + } diff --git a/src/main/java/cn/lihongjie/coal/purchaseOrder/dto/PurchaseOrderDto.java b/src/main/java/cn/lihongjie/coal/purchaseOrder/dto/PurchaseOrderDto.java index b7c48503..ef0f1bed 100644 --- a/src/main/java/cn/lihongjie/coal/purchaseOrder/dto/PurchaseOrderDto.java +++ b/src/main/java/cn/lihongjie/coal/purchaseOrder/dto/PurchaseOrderDto.java @@ -2,14 +2,15 @@ package cn.lihongjie.coal.purchaseOrder.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; import cn.lihongjie.coal.coalInfo.dto.CoalInfoDto; +import cn.lihongjie.coal.common.DictCode; import cn.lihongjie.coal.deliveryInformation.dto.DeliveryInformationDto; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import jakarta.persistence.ManyToOne; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.time.LocalDate; import java.util.List; @@ -25,10 +26,8 @@ public class PurchaseOrderDto extends OrgCommonDto { private LocalDate estimateDeliveryDate; - @Formula("(select min(d.delivery_date) from t_delivery_information d where d.purchase_order_id = id)") private LocalDate firstDeliveryDate; - @Formula("(select max(d.delivery_date) from t_delivery_information d where d.purchase_order_id = id)") private LocalDate lastDeliveryDate; @@ -56,34 +55,24 @@ public class PurchaseOrderDto extends OrgCommonDto { private Double amount; - @Formula("(select sum(d.amount) from t_delivery_information d where d.purchase_order_id = id)") private Double receivedAmount; - @Formula("(select sum(d.car_count) from t_delivery_information d where d.purchase_order_id = id)") private Double totalCarCount; - @Formula("(amount - (select sum(d.amount) from t_delivery_information d where d.purchase_order_id = id))") private Double leftAmount; @Comment("采购单价") private Double price; - @Formula("(amount * price)") private Double total; @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 = 'purchaseOrder.status'\n" - + " and i.code = order_status)") + @DictTranslate(dictKey = DictCode.PURCHASEORDER_STATUS) private String orderStatusName; } diff --git a/src/main/java/cn/lihongjie/coal/purchaseOrder/entity/PurchaseOrderEntity.java b/src/main/java/cn/lihongjie/coal/purchaseOrder/entity/PurchaseOrderEntity.java index c6f6382a..ae9bb645 100644 --- a/src/main/java/cn/lihongjie/coal/purchaseOrder/entity/PurchaseOrderEntity.java +++ b/src/main/java/cn/lihongjie/coal/purchaseOrder/entity/PurchaseOrderEntity.java @@ -75,14 +75,7 @@ public class PurchaseOrderEntity extends OrgCommonEntity { @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 = 'purchaseOrder.status'\n" - + " and i.code = order_status)") - private String orderStatusName; + @Override public void prePersist() {