From d2cf8a7f7bcf49ace058d9eec587d75c4f764a2e Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 02 Jan 2024 11:56:13 +0800
Subject: [PATCH] 考核任务设置被考核人
---
src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetMapper.xml | 10 +++++++---
src/main/java/org/springblade/modules/assessment/entity/AssessmentSetEntity.java | 28 +++++++++++++++++++++-------
2 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/entity/AssessmentSetEntity.java b/src/main/java/org/springblade/modules/assessment/entity/AssessmentSetEntity.java
index d1b54fc..e88169d 100644
--- a/src/main/java/org/springblade/modules/assessment/entity/AssessmentSetEntity.java
+++ b/src/main/java/org/springblade/modules/assessment/entity/AssessmentSetEntity.java
@@ -37,6 +37,15 @@
public class AssessmentSetEntity extends TenantEntity {
/**
+ * 评优任务
+ */
+ @ApiModelProperty(value = "评优任务")
+ private Long assessmentTaskId;
+
+ @ApiModelProperty(value = "评优任务名称")
+ private String assessmentTaskName;
+
+ /**
* 被考核人
*/
@ApiModelProperty(value = "被考核人")
@@ -46,16 +55,21 @@
* 考核人
*/
@ApiModelProperty(value = "考核人")
- private Long toUserId;
+ private String userName;
/**
- * 权值
+ * 部门id
*/
- @ApiModelProperty(value = "权值")
- private Integer weight;
+ @ApiModelProperty(value = "部门id")
+ private Long deptId;
/**
- * 范围
+ * 部门名称
*/
- @ApiModelProperty(value = "范围")
- private Integer rangeVal;
+ @ApiModelProperty(value = "部门名称")
+ private String deptName;
+ /**
+ * 职位名称
+ */
+ @ApiModelProperty(value = "职位名称")
+ private String postName;
}
diff --git a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetMapper.xml b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetMapper.xml
index b81bcc8..ca0ae96 100644
--- a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetMapper.xml
+++ b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentSetMapper.xml
@@ -6,9 +6,13 @@
<resultMap id="assessmentSetResultMap" type="org.springblade.modules.assessment.entity.AssessmentSetEntity">
<result column="id" property="id"/>
<result column="tenant_id" property="tenantId"/>
- <result column="to_user_id" property="toUserId"/>
- <result column="weight" property="weight"/>
- <result column="range" property="range"/>
+ <result column="assessment_task_id" property="assessmentTaskId"/>
+ <result column="assessment_task_name" property="assessmentTaskName"/>
+ <result column="user_id" property="userId"/>
+ <result column="user_name" property="userName"/>
+ <result column="dept_id" property="deptId"/>
+ <result column="dept_name" property="deptName"/>
+ <result column="post_name" property="postName"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
<result column="create_time" property="createTime"/>
--
Gitblit v1.9.3