From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/domain/EntTestPackage.java | 152 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 125 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/domain/EntTestPackage.java b/src/main/java/com/ots/project/exam/domain/EntTestPackage.java
index 1cb8678..aed2e99 100644
--- a/src/main/java/com/ots/project/exam/domain/EntTestPackage.java
+++ b/src/main/java/com/ots/project/exam/domain/EntTestPackage.java
@@ -8,78 +8,175 @@
import java.util.Date;
import java.util.List;
+/**
+ * 娴嬭瘯鍖呯鐞嗗璞� ent_test_package
+ *
+ * @author ots
+ * @date 2019-11-27
+ */
@Getter
@Setter
public class EntTestPackage extends BaseEntity {
private static final long serialVersionUID = 1L;
-
+
+ /**
+ * 娴嬭瘯鍖呯紪鐮�
+ */
private Long id;
-
+
+ /**
+ * 浼佷笟鐢ㄦ埛ID
+ */
@Excel(name = "浼佷笟鐢ㄦ埛ID")
private Long userId;
-
+
+ /**
+ *
+ */
@Excel(name = "浼佷笟鍚嶇О")
private String userName;
-
+
+ /**
+ * 浜у搧缂栫爜
+ */
@Excel(name = "浜у搧缂栫爜")
private Long prodId;
-
+
+ /**
+ * 娴嬭瘯鍖呭悕绉�
+ */
@Excel(name = "娴嬭瘯鍖呭悕绉�")
private String testName;
-
+
+ /**
+ * 浜у搧鍖呭悕绉�
+ */
@Excel(name = "浜у搧鍖呭悕绉�")
private String prodName;
-
+
+ /**
+ * 娴嬭瘯鍖呯被鍨�
+ */
@Excel(name = "娴嬭瘯鍖呯被鍨�")
private String testType;
-
+
+ /**
+ * 鍖哄煙
+ */
@Excel(name = "鍖哄煙")
private String testArea;
-
+
+ /**
+ * 璇
+ */
@Excel(name = "璇")
private String langType;
-
+
+ /**
+ * 閭�璇峰唴瀹�
+ */
@Excel(name = "閭�璇峰唴瀹�")
private String template;
-
+
+ /**
+ * 閫氱煡閭锛岄偖绠遍�氳繃閫楀彿鍒嗛殧
+ */
@Excel(name = "閫氱煡閭锛岄偖绠遍�氳繃閫楀彿鍒嗛殧")
private String testEmail;
-
+
+ /**
+ * 浠诲姟妗嗘灦 鍐呭涓篔SON
+ */
@Excel(name = "浠诲姟妗嗘灦 鍐呭涓篔SON")
private Long frameTextContentId;
-
+
+ /**
+ * 鏈夋晥鏈�
+ */
@Excel(name = "鏈夋晥鏈�", width = 30, dateFormat = "yyyy-MM-dd")
private Date invalidTime;
-
+
+ /**
+ * 鐘舵�侊紙鍚敤銆佹殏鍋溿�佺户缁�佺粨鏉燂級
+ */
@Excel(name = "鐘舵��", readConverterExp = "鍚�=鐢ㄣ�佹殏鍋溿�佺户缁�佺粨鏉�")
private String status;
-
+
+ /**
+ * 娴嬭瘯浜烘暟
+ */
private Long testNum;
-
+
+ /**
+ * 宸叉祴浜烘暟
+ */
private Long finishNum;
-
+
+ /**
+ * 娴嬭瘯涓汉鏁�
+ */
private Long testingNum;
-
+
+ /**
+ * 鏈祴浜烘暟
+ */
private Long unTestNum;
-
+
+ /**
+ * 浜哄彛瀛︾紪鐮佺粍鍚�
+ */
private String paramCodes;
-
+
+ /**
+ * 鐢ㄦ埛鍒楄〃
+ */
private List<Long> userIds;
-
+
+ /**
+ * 鏄惁鑷姩缁欐祴璇曡�呭彂閫佹祴璇曟姤鍛�
+ */
private boolean autoSendReport;
-
+
+ /**
+ * 鎶ュ憡妯℃澘缂栫爜
+ */
private String reportTemplateId;
-
+
+ /**
+ * 鎶ュ憡妯℃澘灞曠ず鍐呭 锛坮eportType-templateType-langType锛�
+ */
private String reportTemplateShowValue;
-
+
+ /**
+ * 鍙戦�佺粰HR閭欢妯℃澘鍐呭
+ */
private String hrTemplate;
-
+
+ /**
+ * 宀椾綅
+ */
private String position;
-
+
+ /**
+ * 鑱屼笟澶х被
+ */
private String professionalCategory;
-
+
+ /**
+ * 涓婄骇宀椾綅
+ *
+ */
private String superiorPosition;
+
private String phonenumber;
+
+ /**
+ * 娴嬭瘯鑰呮帴鏀舵姤鍛婃ā鏉�
+ * @return
+ */
+ private String memberTemplate;
+
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -98,6 +195,7 @@
.append("invalidTime", getInvalidTime())
.append("status", getStatus())
.append("remark", getRemark())
+ .append("memberTemplate", getMemberTemplate())
.toString();
}
}
--
Gitblit v1.9.1