diff --git a/src/com/engine/salary/entity/salaryformula/bo/SalaryFormulaBO.java b/src/com/engine/salary/entity/salaryformula/bo/SalaryFormulaBO.java index 320404eca..90e09a558 100644 --- a/src/com/engine/salary/entity/salaryformula/bo/SalaryFormulaBO.java +++ b/src/com/engine/salary/entity/salaryformula/bo/SalaryFormulaBO.java @@ -27,6 +27,14 @@ public class SalaryFormulaBO { .id(e.getId()) .name(e.getName()) .formula(e.getFormula()) + .description(e.getDescription()) + .extendParam(e.getExtendParam()) + .module(e.getModule()) + .parameters(e.getParameters()) + .referenceType(e.getReferenceType()) + .returnType(e.getReturnType()) + .useFor(e.getUseFor()) + .validateType(e.getValidateType()) .build()) .collect(Collectors.toList()); } diff --git a/src/com/engine/salary/entity/salaryformula/dto/ExpressFormulaDTO.java b/src/com/engine/salary/entity/salaryformula/dto/ExpressFormulaDTO.java index a28c8b2da..57610003e 100644 --- a/src/com/engine/salary/entity/salaryformula/dto/ExpressFormulaDTO.java +++ b/src/com/engine/salary/entity/salaryformula/dto/ExpressFormulaDTO.java @@ -1,10 +1,14 @@ package com.engine.salary.entity.salaryformula.dto; +import com.engine.salary.entity.salaryformula.po.FormulaVar; +import com.engine.salary.util.valid.DataCheck; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * 薪酬管理公式 *
Copyright: Copyright (c) 2022
@@ -27,4 +31,39 @@ public class ExpressFormulaDTO { //公式表达式 private String formula; + + + + /** + * 备注 + */ + private String description; + /** + * 模块 + */ + @DataCheck(require = true,message = "模块为空") + private String module; + /** + * 用途 + */ + private String useFor; + /** + * 引用类型 + */ + private String referenceType; + /** + * 返回类型 + */ + private String returnType; + /** + * 校验类型 + */ + private String validateType; + /** + * 扩展参数 + */ + private String extendParam; + + + private List