Mechrevo 1 year ago
parent
commit
1473578d94

+ 8 - 0
sp-core/sp-base/pom.xml

@@ -47,6 +47,14 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
+        <!-- EasyExcel -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>3.1.1</version>
+        </dependency>
+
+
         <!-- Swagger3依赖 -->
 <!--        <dependency>-->
 <!--            <groupId>io.springfox</groupId>-->

+ 22 - 21
sp-service/level-one-server/src/main/java/com/pj/tb_enterprise/TbEnterprise.java

@@ -3,6 +3,7 @@ package com.pj.tb_enterprise;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -51,82 +52,82 @@ public class TbEnterprise extends Model<TbEnterprise> implements Serializable {
 	/**
 	 * 名称 
 	 */
-	private String name;	
+	private String name;
 
 	/**
 	 * 国别 
 	 */
-	private String nationality;	
+	private String nationality;
 
 	/**
 	 * 商户分类(自营商铺=自营商铺,劳务商铺=劳务商铺) 
 	 */
-	private String type;	
+	private String type;
 
 	/**
 	 * 法人 
 	 */
-	private String legalPerson;	
+	private String legalPerson;
 
 	/**
 	 * 身份证号 
 	 */
-	private String idCard;	
+	private String idCard;
 
 	/**
 	 * 手机号码 
 	 */
-	private String contact;	
+	private String contact;
 
 	/**
 	 * 营业执照 
 	 */
-	private String businessLicense;	
+	private String businessLicense;
 
 	/**
 	 * 所在铺位ID 
 	 */
-	private Long shopId;	
+	private Long shopId;
 
 	/**
 	 * 所在铺位名称(1=100-2) 
 	 */
-	private String shopName;	
+	private String shopName;
 
 	/**
 	 * 银行编号(CMB= 招商银行) 
 	 */
-	private String bankNo;	
+	private String bankNo;
 
 	/**
-	 *  
+	 *
 	 */
-	private String bankName;	
+	private String bankName;
 
 	/**
 	 * 银行账号 
 	 */
-	private String bankAccount;	
+	private String bankAccount;
 
 	/**
 	 * 税号 
 	 */
-	private String dutyParagraph;	
+	private String dutyParagraph;
 
 	/**
-	 *  
+	 *
 	 */
-	private String addressIds;	
+	private String addressIds;
 
 	/**
-	 *  
+	 *
 	 */
-	private String address;	
+	private String address;
 
 	/**
 	 *  
 	 */
-	private String agreement;	
+	private String agreement;
 
 	/**
 	 *  
@@ -136,7 +137,7 @@ public class TbEnterprise extends Model<TbEnterprise> implements Serializable {
 	/**
 	 *  
 	 */
-	private String judgeContent;	
+	private String judgeContent;
 
 	/**
 	 *  
@@ -153,7 +154,7 @@ public class TbEnterprise extends Model<TbEnterprise> implements Serializable {
 	/**
 	 *  
 	 */
-	private String personId;	
+	private String personId;
 
 	/**
 	 * 创建时间 

+ 1 - 1
sp-service/level-one-server/src/main/java/com/pj/tb_enterprise/TbEnterpriseController.java

@@ -114,7 +114,7 @@ public class TbEnterpriseController {
 	 */
 	@RequestMapping("enterpriseOutport")
 	@ResponseBody
-	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam("filepath")String filepath){
+	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam(value = "filepath",required = false)String filepath){
 		try {
 			String importData = tbEnterpriseService.outportExcel(keyword,filepath);
 			AjaxJson.getSuccess(importData);

+ 3 - 0
sp-service/level-one-server/src/main/java/com/pj/tb_enterprise/TbEnterpriseService.java

@@ -6,6 +6,8 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.event.AnalysisEventListener;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.utils.so.SoMap;
 import org.apache.commons.lang3.StringUtils;
@@ -192,4 +194,5 @@ public class TbEnterpriseService extends ServiceImpl<TbEnterpriseMapper, TbEnter
 	}
 
 
+
 }

+ 1 - 1
sp-service/level-one-server/src/main/java/com/pj/tb_goods/TbGoodsController.java

@@ -111,7 +111,7 @@ public class TbGoodsController {
 	 */
 	@RequestMapping("goodsOutport")
 	@ResponseBody
-	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam("filepath")String filepath){
+	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam(value = "filepath",required = false)String filepath){
 		try {
 			String importData = tbGoodsService.outportExcel(keyword,filepath);
 			AjaxJson.getSuccess(importData);

+ 1 - 1
sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransitController.java

@@ -131,7 +131,7 @@ public class TbGoodsTransitController {
 	 */
 	@RequestMapping("goodsTransitOutport")
 	@ResponseBody
-	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam("filepath")String filepath){
+	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam(value = "filepath",required = false)String filepath){
 		try {
 			String importData = tbGoodsTransitService.outportExcel(keyword,filepath);
 			AjaxJson.getSuccess(importData);

+ 1 - 1
sp-service/level-one-server/src/main/java/com/pj/tb_goods_type/TbGoodsTypeController.java

@@ -114,7 +114,7 @@ public class TbGoodsTypeController {
 	 */
 	@RequestMapping("goodsTypeOutport")
 	@ResponseBody
-	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam("filepathh")String filepath){
+	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam(value = "filepathh",required = false)String filepath){
 		try {
 			String importData = tbGoodsTypeService.outportExcel(keyword,filepath);
 			AjaxJson.getSuccess(importData);

+ 1 - 1
sp-service/level-one-server/src/main/java/com/pj/tb_goods_units/TbGoodsUnitsController.java

@@ -101,7 +101,7 @@ public class TbGoodsUnitsController {
 	 */
 	@RequestMapping("goodsUnitsOutport")
 	@ResponseBody
-	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam("filepath")String filepath){
+	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam(value = "filepath",required = false)String filepath){
 		try {
 			String importData = tbGoodsUnitsService.outportExcel(keyword,filepath);
 			AjaxJson.getSuccess(importData);

+ 1 - 1
sp-service/level-one-server/src/main/java/com/pj/tb_group/TbGroupController.java

@@ -115,7 +115,7 @@ public class TbGroupController {
 	 */
 	@RequestMapping("groupOutport")
 	@ResponseBody
-	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam("filepath")String filepath){
+	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam(value = "filepath",required = false)String filepath){
 		try {
 			String importData = tbGroupService.outportExcel(keyword,filepath);
 			AjaxJson.getSuccess(importData);

+ 1 - 1
sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleController.java

@@ -114,7 +114,7 @@ public class TbPeopleController {
 	 */
 	@RequestMapping("peopleOutport")
 	@ResponseBody
-	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam("filepath")String filepath){
+	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam(value = "filepath",required = false)String filepath){
 		try {
 			String importData = tbPeopleService.outportExcel(keyword,filepath);
 			AjaxJson.getSuccess(importData);

+ 1 - 1
sp-service/level-one-server/src/main/java/com/pj/tb_shop/TbShopController.java

@@ -117,7 +117,7 @@ public class TbShopController {
 	 */
 	@RequestMapping("shopOutport")
 	@ResponseBody
-	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam("filepath")String filepath){
+	public AjaxJson dataOutport(@RequestParam(value = "keyword",required = false) String keyword,@RequestParam(value = "filepath",required = false)String filepath){
 		try {
 			String importData = tbShopService.outportExcel(keyword,filepath);
 			AjaxJson.getSuccess(importData);

+ 1 - 1
sp-service/level-one-server/src/main/java/com/pj/tb_trade_area/TbTradeAreaController.java

@@ -118,7 +118,7 @@ public class TbTradeAreaController {
 	 */
 	@RequestMapping("tradeAreaOutport")
 	@ResponseBody
-	public AjaxJson dataOutport(HttpServletResponse response,@RequestParam(value = "keyword",required = false) String keyword,@RequestParam("filepath")String filepath){
+	public AjaxJson dataOutport(HttpServletResponse response,@RequestParam(value = "keyword",required = false) String keyword,@RequestParam(value = "filepath",required = false)String filepath){
 
 		List<TbTradeArea> areaList = tbTradeAreaService.list();
 		ExcelUtil<TbTradeArea> excelUtil = new ExcelUtil<>(TbTradeArea.class);