Commit 61ab114c authored by 赵啸非's avatar 赵啸非

规则添加编码字段

parent e9f02046
...@@ -8,58 +8,62 @@ import com.mortals.framework.model.BaseEntityLong; ...@@ -8,58 +8,62 @@ import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.perform.model.vo.PerformRulesVo; import com.mortals.xhx.module.perform.model.vo.PerformRulesVo;
import lombok.Data; import lombok.Data;
/** /**
* 绩效规则信息实体对象 * 绩效规则信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-05-16 * @date 2023-07-10
*/ */
@Data @Data
public class PerformRulesEntity extends PerformRulesVo { public class PerformRulesEntity extends PerformRulesVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 分类id * 分类id
*/ */
private Long categoryId; private Long categoryId;
/** /**
* 分类名称 * 分类名称
*/ */
private String categoryName; private String categoryName;
/** /**
* 考核内容简称 * 考核内容简称
*/ */
private String name; private String name;
/** /**
* 评分标准 * 评分标准
*/ */
private String content; private String content;
/** /**
* 增减类型(1.增加,2.扣除) * 增减类型(1.增加,2.扣除)
*/ */
private Integer subAddType; private Integer subAddType;
/** /**
* 扣分或增加分值 * 扣分或增加分值
*/ */
private BigDecimal score; private BigDecimal score;
/** /**
* 是否关联负责人(0.否,1.是) * 是否关联负责人(0.否,1.是)
*/ */
private Integer assoOwner; private Integer assoOwner;
/** /**
* 负责人扣分或增加分值 * 负责人扣分或增加分值
*/ */
private BigDecimal ownerScore; private BigDecimal ownerScore;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/** /**
* 规则类型(1.考勤绩效,2.评价绩效指标,3.办件绩效指标,4.效能绩效指标,5.其它绩效指标) * 规则类型(1.考勤绩效,2.评价绩效指标,3.办件绩效指标,4.效能绩效指标,5.其它绩效指标)
*/ */
private Integer type; private Integer type;
/**
* 规则编码,唯一,默认规则类型内容简称拼音首字母。
*/
private String ruleCode;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -67,7 +71,7 @@ public class PerformRulesEntity extends PerformRulesVo { ...@@ -67,7 +71,7 @@ public class PerformRulesEntity extends PerformRulesVo {
if (obj instanceof PerformRulesEntity) { if (obj instanceof PerformRulesEntity) {
PerformRulesEntity tmp = (PerformRulesEntity) obj; PerformRulesEntity tmp = (PerformRulesEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -75,24 +79,26 @@ public class PerformRulesEntity extends PerformRulesVo { ...@@ -75,24 +79,26 @@ public class PerformRulesEntity extends PerformRulesVo {
public void initAttrValue(){ public void initAttrValue(){
this.categoryId = null; this.categoryId = -1L;
this.categoryName = "";
this.categoryName = ""; this.name = "";
this.name = ""; this.content = "";
this.content = ""; this.subAddType = 1;
this.subAddType = 1; this.score = BigDecimal.valueOf(0.00);
this.score = BigDecimal.valueOf(0.00); this.assoOwner = 0;
this.assoOwner = 0; this.ownerScore = BigDecimal.valueOf(0.00);
this.ownerScore = BigDecimal.valueOf(0.00); this.remark = "";
this.remark = ""; this.type = 1;
this.type = null; this.ruleCode = "";
} }
} }
\ No newline at end of file
...@@ -381,3 +381,6 @@ ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `categoryId` bigint(20) ...@@ -381,3 +381,6 @@ ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `categoryId` bigint(20)
ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `categoryName` varchar(128) COMMENT '规则名称' AFTER categoryId; ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `categoryName` varchar(128) COMMENT '规则名称' AFTER categoryId;
ALTER TABLE mortals_xhx_perform_rules ADD COLUMN `ruleCode` varchar(64) COMMENT '规则编码,唯一,默认规则类型内容简称拼音首字母。'AFTER id;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment