Merge remote-tracking branch 'origin/master'

xiangpei

2024-03-13 10df3eebf12aa53fe2f66af2dc75fcd0ef12251c

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckTemplateForm.java

@@ -1,5 +1,6 @@
package com.ycl.platform.domain.form;

import com.ycl.platform.domain.vo.RuleItemVO;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
@@ -48,7 +49,7 @@

    @NotEmpty(message = "考核规则不能为空")
    @ApiModelProperty("考核规则")
    private List<RuleItem> ruleList;
    private List<RuleItemVO> ruleFormList;

    public static CheckTemplate getEntityByForm(@NonNull CheckTemplateForm form, CheckTemplate entity) {
        if(entity == null) {
@@ -56,35 +57,6 @@
        }
        BeanUtils.copyProperties(form, entity);
        return entity;
    }

    public class RuleItem {

        /**
         * 规则
         */
        private Integer ruleId;

        /**
         * 权重
         */
        private BigDecimal weight;

        public Integer getRuleId() {
            return ruleId;
        }

        public void setRuleId(Integer ruleId) {
            this.ruleId = ruleId;
        }

        public BigDecimal getWeight() {
            return weight;
        }

        public void setWeight(BigDecimal weight) {
            this.weight = weight;
        }
    }

}