From 04268417291c9ba021b4ff11e09169c2b01c69b6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 12 七月 2025 11:47:20 +0800
Subject: [PATCH] bug修改
---
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..cb9bff8 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 = "项目部编号",width = 20)
private String deptCode;
- @ApiModelProperty(value = "项目部名称")
+ @Excel(name = "项目部名称",width = 20)
private String deptName;
- @ApiModelProperty(value = "基层管理员姓名 巡检员")
+ @Excel(name = "基层管理员部门编号",width = 20)
+ private String deptNumber;
+ @Excel(name = "基层管理员项目部编号",width = 20)
+ private String projectDeptNumber;
+ @Excel(name = "基层管理员姓名 巡检员",width = 20)
private String nickName;
-// @ApiModelProperty(value = "保洁员部门编号")
-// private String nickName;
-// @ApiModelProperty(value = "基层管理员姓名 巡检员")
-// private String nickName;
-// @ApiModelProperty(value = "基层管理员姓名 巡检员")
-// private String nickName;
+ @Excel(name = "保洁员部门编号",width = 20)
+ private String deptCodeClear;
+ @Excel(name = "保洁员项目部编号",width = 20)
+ private String projectCodeClear;
+ @Excel(name = "保洁员片区编号",width = 20)
+ private String cleanerCodeClear;
+ @Excel(name = "保洁员(驾驶员)",width = 20)
+ private String cleanerName;
+ @Excel(name = "路段总号",width = 20)
+ private String locationCode;
+ @Excel(name = "个人编号",width = 20)
+ private String cleanerCode;
+ @Excel(name = "点位类型",width = 20)
+ private String locationType;
+ @Excel(name = "路段名（村名）",width = 20)
+ private String locationName;
+ @Excel(name = "起点",width = 20)
+ private String locationAddress;
+ @Excel(name = "终点",width = 20)
+ private String locationAddressEnd;
+ @Excel(name = "起点（经纬度）",width = 20)
+ private String locationAddressLonLat;
+ @Excel(name = "终点（经纬度）",width = 20)
+ private String locationAddressEndLonLat;
}
--
Gitblit v1.7.1