From ce0651907f18a57dae80065e01589e975530f53e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 五月 2025 18:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TResultWorkEvaluate.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TResultWorkEvaluate.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TResultWorkEvaluate.java
index 18bde3f..00b6967 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TResultWorkEvaluate.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TResultWorkEvaluate.java
@@ -13,7 +13,7 @@
/**
* <p>
- * 实验员工作评定
+ * 实验结果评定
* </p>
*
* @author xiaochen
@@ -22,25 +22,31 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_result_work_evaluate")
-@ApiModel(value="TResultWorkEvaluate对象", description="实验员工作评定")
+@ApiModel(value="TResultWorkEvaluate对象", description="实验结果评定")
public class TResultWorkEvaluate extends BaseModel {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
-
+ @ApiModelProperty(value = "项目组id")
+ @TableField("team_id")
+ private String teamId;
@ApiModelProperty(value = "调度id")
@TableField("dispatch_id")
private String dispatchId;
- @ApiModelProperty(value = "实验员id")
+ @ApiModelProperty(value = "用户id")
@TableField("user_id")
private Integer userId;
@ApiModelProperty(value = "实验结果id")
@TableField("result_report_id")
private String resultReportId;
+
+ @ApiModelProperty(value = "评定类型 1=工艺工程师 2=化验师 3=实验员")
+ @TableField("evaluate_type")
+ private Integer evaluateType;
@ApiModelProperty(value = "1=良好 2=正确 3=失误")
@TableField("evaluate_one")
@@ -79,6 +85,9 @@
@TableField("evaluate_time")
private LocalDateTime evaluateTime;
+ @ApiModelProperty(value = "评定分数 json")
+ @TableField("result_evaluate_json")
+ private String resultEvaluateJson;
}
--
Gitblit v1.7.1