From 1d966b7d8886b3e76477b0fd481216bfe7684605 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 08 Dec 2023 15:22:05 +0800
Subject: [PATCH] 考核相关
---
src/main/java/org/springblade/modules/assessment/excel/AssessmentSetExcel.java | 38 +++++++++++++-------------------------
1 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/src/main/java/org/springblade/assessmentTask/excel/AssessmentTaskExcel.java b/src/main/java/org/springblade/modules/assessment/excel/AssessmentSetExcel.java
similarity index 72%
copy from src/main/java/org/springblade/assessmentTask/excel/AssessmentTaskExcel.java
copy to src/main/java/org/springblade/modules/assessment/excel/AssessmentSetExcel.java
index 1a8ef3d..6f7f967 100644
--- a/src/main/java/org/springblade/assessmentTask/excel/AssessmentTaskExcel.java
+++ b/src/main/java/org/springblade/modules/assessment/excel/AssessmentSetExcel.java
@@ -14,7 +14,7 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.springblade.assessmentTask.excel;
+package org.springblade.modules.assessment.excel;
import lombok.Data;
@@ -28,16 +28,16 @@
/**
- * 考核任务表 Excel实体类
+ * 考核权重 Excel实体类
*
* @author aix
- * @since 2023-12-07
+ * @since 2023-12-08
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
-public class AssessmentTaskExcel implements Serializable {
+public class AssessmentSetExcel implements Serializable {
private static final long serialVersionUID = 1L;
@@ -48,35 +48,23 @@
@ExcelProperty("租户ID")
private String tenantId;
/**
- * 考核编号
+ * 考核人
*/
@ColumnWidth(20)
- @ExcelProperty("考核编号")
- private String assessmentNo;
+ @ExcelProperty("考核人")
+ private Long toUserId;
/**
- * 考核目的
+ * 权值
*/
@ColumnWidth(20)
- @ExcelProperty("考核目的")
- private String assessmentPurpose;
+ @ExcelProperty("权值")
+ private Integer weight;
/**
- * 开始时间
+ * 范围
*/
@ColumnWidth(20)
- @ExcelProperty("开始时间")
- private Date startTime;
- /**
- * 结束时间
- */
- @ColumnWidth(20)
- @ExcelProperty("结束时间")
- private Date endTime;
- /**
- * 备注
- */
- @ColumnWidth(20)
- @ExcelProperty("备注")
- private String remark;
+ @ExcelProperty("范围")
+ private Integer range;
/**
* 是否已删除
*/
--
Gitblit v1.9.3