From 951b06c1aaa8cc4c83f9e4b4ba9fae066fd84941 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 七月 2025 21:11:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java b/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java
index 72332f4..67423d5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/importExcel/TLocationImportExcel.java
@@ -1,7 +1,7 @@
package com.ruoyi.system.importExcel;
+import cn.afterturn.easypoi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -10,17 +10,39 @@
@ApiModel(value = "点位导入excel")
public class TLocationImportExcel implements Serializable {
- @ApiModelProperty(value = "项目部编号")
+ @Excel(name = "项目部编号")
private String deptCode;
- @ApiModelProperty(value = "项目部名称")
+ @Excel(name = "项目部名称")
private String deptName;
- @ApiModelProperty(value = "基层管理员姓名 巡检员")
+ @Excel(name = "基层管理员部门编号")
+ private String deptNumber;
+ @Excel(name = "基层管理员项目部编号")
+ private String projectDeptNumber;
+ @Excel(name = "基层管理员姓名 巡检员")
private String nickName;
-// @ApiModelProperty(value = "保洁员部门编号")
-// private String nickName;
-// @ApiModelProperty(value = "基层管理员姓名 巡检员")
-// private String nickName;
-// @ApiModelProperty(value = "基层管理员姓名 巡检员")
-// private String nickName;
+ @Excel(name = "保洁员部门编号")
+ private String projectCodeClear;
+ @Excel(name = "保洁员项目部编号")
+ private String deptCodeClear;
+ @Excel(name = "保洁员片区编号")
+ private String cleanerCodeClear;
+ @Excel(name = "保洁员(驾驶员)")
+ private String cleanerName;
+ @Excel(name = "路段总号")
+ private String locationCode;
+ @Excel(name = "个人编号")
+ private String cleanerCode;
+ @Excel(name = "点位类型")
+ private String locationType;
+ @Excel(name = "路段名（村名）")
+ private String locationName;
+ @Excel(name = "起点")
+ private String locationAddress;
+ @Excel(name = "终点")
+ private String locationAddressEnd;
+ @Excel(name = "起点（经纬度）")
+ private String locationAddressLonLat;
+ @Excel(name = "终点（经纬度）")
+ private String locationAddressEndLonLat;
}
--
Gitblit v1.7.1