From 05600d089901d44e8d5036046025b6a90ceb896a Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: Tue, 03 Dec 2024 16:57:20 +0800
Subject: [PATCH] 修改及增加功能
---
expert-system/src/main/java/com/gkhy/system/domain/Evaluation.java | 159 +++++++++++++++++++++++++++++++---------------------
1 files changed, 94 insertions(+), 65 deletions(-)
diff --git a/expert-system/src/main/java/com/gkhy/system/domain/Evaluation.java b/expert-system/src/main/java/com/gkhy/system/domain/Evaluation.java
index 91b6bef..49448a9 100644
--- a/expert-system/src/main/java/com/gkhy/system/domain/Evaluation.java
+++ b/expert-system/src/main/java/com/gkhy/system/domain/Evaluation.java
@@ -3,10 +3,16 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.gkhy.common.annotation.Excel;
+import com.gkhy.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.rchuing.sis.common.annotation.Excel;
-import com.rchuing.sis.common.core.domain.BaseEntity;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
/**
* 考评管理对象 evaluation
@@ -14,80 +20,103 @@
* @author expert
* @date 2024-11-13
*/
- @TableName(resultMap = "com.gkhy.system.mapper.EvaluationMapper.EvaluationResult")
- public class Evaluation extends BaseEntity
- {
- private static final long serialVersionUID = 1L;
+@TableName(resultMap = "com.gkhy.system.mapper.EvaluationMapper.EvaluationResult")
+@ApiModel(value = "考评管理对象", description = "考评管理表")
+public class Evaluation extends BaseEntity {
+ private static final long serialVersionUID = 1L;
- /** $column.columnComment */
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
+ /**
+ * $column.columnComment
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
- /** 分值 */
- @Excel(name = "分值")
- private Long score;
+ /**
+ * 分值
+ */
+ @Excel(name = "分值")
+ @NotNull(message ="分值不能为空" )
+ @ApiModelProperty(value = "分值",required = true)
+ private Long score;
- /** 内容 */
- @Excel(name = "内容")
- private String content;
+ /**
+ * 内容
+ */
+ @Excel(name = "内容")
+ @NotBlank(message ="内容不能为空" )
+ @ApiModelProperty(value = "内容",required = true)
+ private String content;
- /** 类型1加分项2扣分项 */
- @Excel(name = "类型1加分项2扣分项")
- private String scoreType;
+ /**
+ * 类型1加分项2扣分项
+ */
+ @Excel(name = "类型1加分项2扣分项")
+ @NotBlank(message ="类型不能为空" )
+ @ApiModelProperty(value = "类型1加分项2扣分项",required = true)
+ private String scoreType;
- /** 删除标志(0代表存在，1代表删除，默认0) */
- private Long delFlag;
+ /**
+ * 删除标志(0代表存在，1代表删除，默认0)
+ */
+ private Long delFlag;
- /** 乐观锁 */
- @Excel(name = "乐观锁")
- private Long version;
+ /**
+ * 乐观锁
+ */
+ @Excel(name = "乐观锁")
+ private Long version;
- public void setId(Long id) {
- this.id = id;
- }
+ public void setId(Long id) {
+ this.id = id;
+ }
- public Long getId() {
- return id;
- }
- public void setScore(Long score) {
- this.score = score;
- }
+ public Long getId() {
+ return id;
+ }
- public Long getScore() {
- return score;
- }
- public void setContent(String content) {
- this.content = content;
- }
+ public void setScore(Long score) {
+ this.score = score;
+ }
- public String getContent() {
- return content;
- }
- public void setScoreType(String scoreType) {
- this.scoreType = scoreType;
- }
+ public Long getScore() {
+ return score;
+ }
- public String getScoreType() {
- return scoreType;
- }
- public void setDelFlag(Long delFlag) {
- this.delFlag = delFlag;
- }
+ public void setContent(String content) {
+ this.content = content;
+ }
- public Long getDelFlag() {
- return delFlag;
- }
- public void setVersion(Long version) {
- this.version = version;
- }
+ public String getContent() {
+ return content;
+ }
- public Long getVersion() {
- return version;
- }
+ public void setScoreType(String scoreType) {
+ this.scoreType = scoreType;
+ }
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ public String getScoreType() {
+ return scoreType;
+ }
+
+ public void setDelFlag(Long delFlag) {
+ this.delFlag = delFlag;
+ }
+
+ public Long getDelFlag() {
+ return delFlag;
+ }
+
+ public void setVersion(Long version) {
+ this.version = version;
+ }
+
+ public Long getVersion() {
+ return version;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("score", getScore())
.append("content", getContent())
@@ -98,6 +127,6 @@
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
- .toString();
- }
- }
\ No newline at end of file
+ .toString();
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.2