From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog

---
 src/main/java/org/springblade/modules/place/excel/ImportPractitionerExcel.java |   95 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 95 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/excel/ImportPractitionerExcel.java b/src/main/java/org/springblade/modules/place/excel/ImportPractitionerExcel.java
new file mode 100644
index 0000000..5a47fbd
--- /dev/null
+++ b/src/main/java/org/springblade/modules/place/excel/ImportPractitionerExcel.java
@@ -0,0 +1,95 @@
+package org.springblade.modules.place.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+import org.springblade.common.excel.ExcelDictConverter;
+import org.springblade.common.excel.ExcelDictItem;
+import org.springblade.common.excel.ExcelDictItemLabel;
+
+import java.io.Serializable;
+
+/**
+ * 场所从业人员 实体类
+ *
+ * @author BladeX
+ * @since 2023-10-28
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class ImportPractitionerExcel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 场所ID
+	 */
+	@ExcelProperty("地址编码*")
+	private String houseCode;
+
+	/**
+	 * 姓名
+	 */
+	@ExcelProperty("姓名")
+	private String name;
+
+	/**
+	 * 电话
+	 */
+	@ExcelProperty("电话")
+	private String telephone;
+
+	/**
+	 * 暂住地
+	 */
+	@ExcelProperty("暂住地")
+	private String tempAddress;
+
+	/**
+	 * 身份证
+	 */
+	@ExcelProperty("身份证")
+	private String idCard;
+
+	/**
+	 * 岗位
+	 */
+	@ExcelProperty("岗位")
+	private String jobNature;
+
+	/**
+	 * 民族
+	 */
+	@ColumnWidth(15)
+	@ExcelProperty(value = "民族", converter = ExcelDictConverter.class)
+	@ExcelDictItemLabel(type = "nationType")
+	@ExcelDictItem(type = "nationType")
+	private String ethnicity;
+
+	/**
+	 * 入职时间
+	 */
+	// @ExcelProperty("入职时间")
+	// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	// @DateTimeFormat("yyyy-MM-dd")
+	// private String employmentTime;
+
+	/**
+	 * 离职时间
+	 */
+	// @ExcelProperty("离职时间")
+	// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	// @DateTimeFormat("yyyy-MM-dd")
+	// private String resignationTime;
+
+	/**
+	 * 是离职 1:否 2:是
+	 */
+	@ExcelProperty("是离职 1:否 2:是")
+	private String resignationFlag;
+
+
+}

--
Gitblit v1.9.3