diff --git a/src/main/java/cn/lihongjie/coal/coalBlend/dto/CreateCoalBlendDto.java b/src/main/java/cn/lihongjie/coal/coalBlend/dto/CreateCoalBlendDto.java index 5b01a01b..208d809c 100644 --- a/src/main/java/cn/lihongjie/coal/coalBlend/dto/CreateCoalBlendDto.java +++ b/src/main/java/cn/lihongjie/coal/coalBlend/dto/CreateCoalBlendDto.java @@ -11,7 +11,6 @@ import jakarta.validation.constraints.Size; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.util.List; @@ -37,14 +36,7 @@ public class CreateCoalBlendDto 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 = 'coalBlend.coalType'\n" - + " and i.code = coal_type)") - private String coalTypeName; + @Comment("结果个数") private Integer count = 20; diff --git a/src/main/java/cn/lihongjie/coal/coalBlend/dto/UpdateCoalBlendDto.java b/src/main/java/cn/lihongjie/coal/coalBlend/dto/UpdateCoalBlendDto.java index 69111a9f..5e5df73e 100644 --- a/src/main/java/cn/lihongjie/coal/coalBlend/dto/UpdateCoalBlendDto.java +++ b/src/main/java/cn/lihongjie/coal/coalBlend/dto/UpdateCoalBlendDto.java @@ -11,7 +11,6 @@ import jakarta.validation.constraints.Size; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.util.List; @@ -37,14 +36,6 @@ public class UpdateCoalBlendDto 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 = 'coalBlend.coalType'\n" - + " and i.code = coal_type)") - private String coalTypeName; @Comment("结果个数") private Integer count = 20; diff --git a/src/main/java/cn/lihongjie/coal/cronJobLog/dto/CreateCronJobLogDto.java b/src/main/java/cn/lihongjie/coal/cronJobLog/dto/CreateCronJobLogDto.java index 834c20f8..a20dca5c 100644 --- a/src/main/java/cn/lihongjie/coal/cronJobLog/dto/CreateCronJobLogDto.java +++ b/src/main/java/cn/lihongjie/coal/cronJobLog/dto/CreateCronJobLogDto.java @@ -4,8 +4,6 @@ import cn.lihongjie.coal.base.dto.CommonDto; import lombok.Data; -import org.hibernate.annotations.Formula; - import java.time.LocalDateTime; @Data @@ -21,7 +19,6 @@ public class CreateCronJobLogDto extends CommonDto { private LocalDateTime startTime; private LocalDateTime endTime; - @Formula("(EXTRACT(EPOCH FROM (endTime - startTime)) * 1000)") private long time; private String logs; diff --git a/src/main/java/cn/lihongjie/coal/cronJobLog/dto/UpdateCronJobLogDto.java b/src/main/java/cn/lihongjie/coal/cronJobLog/dto/UpdateCronJobLogDto.java index 104dd5ff..b26a387a 100644 --- a/src/main/java/cn/lihongjie/coal/cronJobLog/dto/UpdateCronJobLogDto.java +++ b/src/main/java/cn/lihongjie/coal/cronJobLog/dto/UpdateCronJobLogDto.java @@ -4,8 +4,6 @@ import cn.lihongjie.coal.base.dto.CommonDto; import lombok.Data; -import org.hibernate.annotations.Formula; - import java.time.LocalDateTime; @Data @@ -21,7 +19,6 @@ public class UpdateCronJobLogDto extends CommonDto { private LocalDateTime startTime; private LocalDateTime endTime; - @Formula("(EXTRACT(EPOCH FROM (endTime - startTime)) * 1000)") private long time; private String logs; diff --git a/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/CreateEmpSalaryItemDto.java b/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/CreateEmpSalaryItemDto.java index 7a2a0294..50dc3398 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/CreateEmpSalaryItemDto.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/CreateEmpSalaryItemDto.java @@ -5,7 +5,6 @@ import cn.lihongjie.coal.base.dto.OrgCommonDto; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data @@ -24,28 +23,12 @@ public class CreateEmpSalaryItemDto 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("工资项目类型-名称") - 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/empSalaryItem/dto/UpdateEmpSalaryItemDto.java b/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/UpdateEmpSalaryItemDto.java index d5be3add..ef4cd9ec 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/UpdateEmpSalaryItemDto.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItem/dto/UpdateEmpSalaryItemDto.java @@ -33,15 +33,7 @@ public class UpdateEmpSalaryItemDto 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("工资项目类型-名称") - private String itemTypeName; + @Comment("工资项目录入方式") private String inputType; diff --git a/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/dto/CreateEmpSalaryItemConfigDto.java b/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/dto/CreateEmpSalaryItemConfigDto.java index cf2a4692..49144601 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/dto/CreateEmpSalaryItemConfigDto.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/dto/CreateEmpSalaryItemConfigDto.java @@ -6,21 +6,13 @@ import cn.lihongjie.coal.base.dto.OrgCommonDto; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data public class CreateEmpSalaryItemConfigDto 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)") - private String itemTypeName; + diff --git a/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/dto/UpdateEmpSalaryItemConfigDto.java b/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/dto/UpdateEmpSalaryItemConfigDto.java index b17dabcc..8b030b3a 100644 --- a/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/dto/UpdateEmpSalaryItemConfigDto.java +++ b/src/main/java/cn/lihongjie/coal/empSalaryItemConfig/dto/UpdateEmpSalaryItemConfigDto.java @@ -6,7 +6,6 @@ import cn.lihongjie.coal.base.dto.OrgCommonDto; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data public class UpdateEmpSalaryItemConfigDto extends OrgCommonDto { @@ -14,14 +13,7 @@ public class UpdateEmpSalaryItemConfigDto 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)") - private String itemTypeName; + diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java index 323edac7..b957b9b6 100644 --- a/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java +++ b/src/main/java/cn/lihongjie/coal/employee/dto/CreateEmployeeDto.java @@ -10,7 +10,6 @@ import jakarta.persistence.ElementCollection; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.time.LocalDate; import java.util.List; @@ -129,12 +128,5 @@ public class CreateEmployeeDto 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)") - private String empStatusName; + } diff --git a/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java b/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java index 15d455b5..3cca7bd9 100644 --- a/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java +++ b/src/main/java/cn/lihongjie/coal/employee/dto/UpdateEmployeeDto.java @@ -11,7 +11,6 @@ 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; @@ -133,13 +132,6 @@ public class UpdateEmployeeDto 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)") - private String empStatusName; + } diff --git a/src/main/java/cn/lihongjie/coal/employeeRecord/dto/UpdateEmployeeRecordDto.java b/src/main/java/cn/lihongjie/coal/employeeRecord/dto/UpdateEmployeeRecordDto.java index 75c0c034..0b9c6c1e 100644 --- a/src/main/java/cn/lihongjie/coal/employeeRecord/dto/UpdateEmployeeRecordDto.java +++ b/src/main/java/cn/lihongjie/coal/employeeRecord/dto/UpdateEmployeeRecordDto.java @@ -7,7 +7,6 @@ import jakarta.persistence.ManyToOne; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data public class UpdateEmployeeRecordDto extends OrgCommonDto { @@ -21,14 +20,6 @@ public class UpdateEmployeeRecordDto 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)") - private String recordTypeName; diff --git a/src/main/java/cn/lihongjie/coal/loginUserHis/dto/CreateLoginUserHisDto.java b/src/main/java/cn/lihongjie/coal/loginUserHis/dto/CreateLoginUserHisDto.java index 97f4be12..e6508b7d 100644 --- a/src/main/java/cn/lihongjie/coal/loginUserHis/dto/CreateLoginUserHisDto.java +++ b/src/main/java/cn/lihongjie/coal/loginUserHis/dto/CreateLoginUserHisDto.java @@ -23,14 +23,7 @@ public class CreateLoginUserHisDto extends CommonDto { private String status; - @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 = 'loginUserHis.status'\n" - + " and i.code = status)") - private String statusName; + @Comment("session id") private String sessionId; diff --git a/src/main/java/cn/lihongjie/coal/loginUserHis/dto/UpdateLoginUserHisDto.java b/src/main/java/cn/lihongjie/coal/loginUserHis/dto/UpdateLoginUserHisDto.java index 98b6149e..bd7e7198 100644 --- a/src/main/java/cn/lihongjie/coal/loginUserHis/dto/UpdateLoginUserHisDto.java +++ b/src/main/java/cn/lihongjie/coal/loginUserHis/dto/UpdateLoginUserHisDto.java @@ -22,14 +22,7 @@ public class UpdateLoginUserHisDto extends CommonDto { private String status; - @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 = 'loginUserHis.status'\n" - + " and i.code = status)") - private String statusName; + @Comment("session id") private String sessionId; diff --git a/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/CreateNoteBookChapterDto.java b/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/CreateNoteBookChapterDto.java index 9ec2bf6f..6ebdd95a 100644 --- a/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/CreateNoteBookChapterDto.java +++ b/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/CreateNoteBookChapterDto.java @@ -5,7 +5,6 @@ import cn.lihongjie.coal.base.dto.CommonDto; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data public class CreateNoteBookChapterDto extends CommonDto { @@ -16,14 +15,6 @@ public class CreateNoteBookChapterDto 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)") - private String contentTypeName; @Comment("内容") private String content; diff --git a/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/UpdateNoteBookChapterDto.java b/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/UpdateNoteBookChapterDto.java index dbb28815..ed185d28 100644 --- a/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/UpdateNoteBookChapterDto.java +++ b/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/UpdateNoteBookChapterDto.java @@ -5,7 +5,6 @@ import cn.lihongjie.coal.base.dto.CommonDto; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data public class UpdateNoteBookChapterDto extends CommonDto { @@ -16,14 +15,6 @@ public class UpdateNoteBookChapterDto 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)") - private String contentTypeName; @Comment("内容") private String content; diff --git a/src/main/java/cn/lihongjie/coal/purchaseOrder/dto/CreatePurchaseOrderDto.java b/src/main/java/cn/lihongjie/coal/purchaseOrder/dto/CreatePurchaseOrderDto.java index 36add207..81bc5245 100644 --- a/src/main/java/cn/lihongjie/coal/purchaseOrder/dto/CreatePurchaseOrderDto.java +++ b/src/main/java/cn/lihongjie/coal/purchaseOrder/dto/CreatePurchaseOrderDto.java @@ -7,7 +7,6 @@ import jakarta.persistence.ManyToOne; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.time.LocalDate; @@ -35,10 +34,8 @@ public class CreatePurchaseOrderDto 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; diff --git a/src/main/java/cn/lihongjie/coal/thirdAccount/dto/CreateThirdAccountDto.java b/src/main/java/cn/lihongjie/coal/thirdAccount/dto/CreateThirdAccountDto.java index 06412cb9..0daa5668 100644 --- a/src/main/java/cn/lihongjie/coal/thirdAccount/dto/CreateThirdAccountDto.java +++ b/src/main/java/cn/lihongjie/coal/thirdAccount/dto/CreateThirdAccountDto.java @@ -5,7 +5,6 @@ import cn.lihongjie.coal.base.dto.OrgCommonDto; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data public class CreateThirdAccountDto extends OrgCommonDto { @@ -13,14 +12,6 @@ public class CreateThirdAccountDto extends OrgCommonDto { @Comment("账号类型") private String accountType; - @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 = 'thirdAccount.type'\n" - + " and i.code = account_type)") - private String accountTypeName; @Comment("用户名") private String username; diff --git a/src/main/java/cn/lihongjie/coal/thirdAccount/dto/UpdateThirdAccountDto.java b/src/main/java/cn/lihongjie/coal/thirdAccount/dto/UpdateThirdAccountDto.java index dbf2a07b..bd0678ea 100644 --- a/src/main/java/cn/lihongjie/coal/thirdAccount/dto/UpdateThirdAccountDto.java +++ b/src/main/java/cn/lihongjie/coal/thirdAccount/dto/UpdateThirdAccountDto.java @@ -5,21 +5,13 @@ import cn.lihongjie.coal.base.dto.OrgCommonDto; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data public class UpdateThirdAccountDto extends OrgCommonDto { @Comment("账号类型") private String accountType; - @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 = 'thirdAccount.type'\n" - + " and i.code = account_type)") - private String accountTypeName; + @Comment("用户名") private String username;