From 4b5624af301dfbdcf54b65dc55aadde1b6a8efd5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 24 七月 2024 19:55:24 +0800
Subject: [PATCH] bug修改，查询季度写死“2024年一季度”
---
finance-admin/src/main/java/com/finance/web/controller/excel/DeptExcel.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/finance-admin/src/main/java/com/finance/web/controller/excel/DeptExcel.java b/finance-admin/src/main/java/com/finance/web/controller/excel/DeptExcel.java
index 94dcc62..c9a814f 100644
--- a/finance-admin/src/main/java/com/finance/web/controller/excel/DeptExcel.java
+++ b/finance-admin/src/main/java/com/finance/web/controller/excel/DeptExcel.java
@@ -6,10 +6,9 @@
import com.finance.web.controller.conveter.CountyFlagConverter;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
/**
* <p>
@@ -21,53 +20,53 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="部门导入Excel对象")
+@ApiModel(value = "部门导入Excel对象")
public class DeptExcel implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "部门地区")
@Excel(name = "部门地区")
- @ExcelProperty(value = "部门地区",index = 0)
+ @ExcelProperty(value = "部门地区", index = 0)
private String areaName;
@ApiModelProperty(value = "别名")
@Excel(name = "别名")
- @ExcelProperty(value = "别名",index = 1)
+ @ExcelProperty(value = "别名", index = 1)
private String areaAlias;
@ApiModelProperty(value = "区划代码")
@Excel(name = "区划代码")
- @ExcelProperty(value = "区划代码",index = 2)
+ @ExcelProperty(value = "区划代码", index = 2)
private String areaCode;
@ApiModelProperty(value = "级次（省、市、县）")
@Excel(name = "级次（省、市、县）")
- @ExcelProperty(value = "级次 （省、市、县）",index = 3)
+ @ExcelProperty(value = "级次 （省、市、县）", index = 3)
private String areaLevel;
@ApiModelProperty(value = "县级标志（不包含直辖市的区 0：否 1：是）")
- @Excel(name = "县级标志 是/否",enumImportMethod = "getByDesc")
- @ExcelProperty(value = "县级标志 是/否",index = 4,converter = CountyFlagConverter.class)
+ @Excel(name = "县级标志 是/否", enumImportMethod = "getByDesc")
+ @ExcelProperty(value = "县级标志 是/否", index = 4, converter = CountyFlagConverter.class)
private DisabledEnum countyFlag;
@ApiModelProperty(value = "登录账号")
@Excel(name = "登录账号")
- @ExcelProperty(value = "登录账号",index = 6)
+ @ExcelProperty(value = "登录账号", index = 6)
private String userName;
@ApiModelProperty(value = "负责人姓名")
- @ExcelProperty(value = "负责人姓名",index = 5)
+ @ExcelProperty(value = "负责人姓名", index = 5)
private String personInCharge;
@ApiModelProperty(value = "联系电话")
@Excel(name = "联系电话")
- @ExcelProperty(value = "联系电话",index = 7)
+ @ExcelProperty(value = "联系电话", index = 7)
private String phoneNumber;
@ApiModelProperty(value = "登录密码")
@Excel(name = "登录密码")
- @ExcelProperty(value = "登录密码",index = 8)
+ @ExcelProperty(value = "登录密码", index = 8)
private String password;
}
--
Gitblit v1.7.1