mirror of
https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git
synced 2026-01-25 07:46:40 +08:00
优化
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
package cn.lihongjie.coal.coalParameterDef.dto;
|
||||
|
||||
import cn.lihongjie.coal.base.dto.OrgCommonDto;
|
||||
import cn.lihongjie.coal.common.DictCode;
|
||||
import cn.lihongjie.coal.pojoProcessor.DictTranslate;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -15,6 +17,7 @@ public class CoalParameterDefDto extends OrgCommonDto {
|
||||
@Comment("类型 0 手动输入 1 自动计算")
|
||||
private String inputType;
|
||||
|
||||
@DictTranslate(dictKey = DictCode.COALPARAMETER_INPUTTYPE)
|
||||
private String inputTypeName;
|
||||
|
||||
@Comment("计算公式")
|
||||
|
||||
@@ -7,7 +7,6 @@ import jakarta.persistence.Entity;
|
||||
import lombok.Data;
|
||||
|
||||
import org.hibernate.annotations.Comment;
|
||||
import org.hibernate.annotations.Formula;
|
||||
|
||||
@Entity
|
||||
@Data
|
||||
@@ -19,14 +18,7 @@ public class CoalParameterDefEntity extends OrgCommonEntity {
|
||||
@Comment("类型 0 手动输入 1 自动计算")
|
||||
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 = 'coalParameter.inputType'\n"
|
||||
+ " and i.code = input_type)")
|
||||
private String inputTypeName;
|
||||
|
||||
|
||||
@Comment("计算公式")
|
||||
private String formula;
|
||||
|
||||
Reference in New Issue
Block a user