This commit is contained in:
2024-04-18 15:20:07 +08:00
parent 0669cf83eb
commit 895d5d24f8
2 changed files with 4 additions and 9 deletions

View File

@@ -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("计算公式")

View File

@@ -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;