diff --git a/newstock-system/src/main/java/com/ruoyi/newstocksystem/controller/NewStocksController.java b/newstock-system/src/main/java/com/ruoyi/newstocksystem/controller/NewStocksController.java index 7ca3fe1..0c47775 100644 --- a/newstock-system/src/main/java/com/ruoyi/newstocksystem/controller/NewStocksController.java +++ b/newstock-system/src/main/java/com/ruoyi/newstocksystem/controller/NewStocksController.java @@ -1,5 +1,8 @@ package com.ruoyi.newstocksystem.controller; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -139,6 +142,20 @@ public class NewStocksController extends BaseController @PostMapping("/importData") public AjaxResult importData(MultipartFile file, boolean updateSupport, String tradeDate) { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//注意月份是MM + System.out.println(" tradeDay :" + tradeDate); + Date tradeDay1 = null; + try + { + tradeDay1 = simpleDateFormat.parse(tradeDate); + }catch (ParseException e) { + e.printStackTrace(); + } + if(tradeDay1 == null) + { + return AjaxResult.success("tradeday error, import data failed"); + } + ExcelUtil util = new ExcelUtil(NewStocks.class); try { diff --git a/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/NewStocks.java b/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/NewStocks.java index 6d40f29..cc9613b 100644 --- a/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/NewStocks.java +++ b/newstock-system/src/main/java/com/ruoyi/newstocksystem/domain/NewStocks.java @@ -90,8 +90,7 @@ public class NewStocks extends BaseEntity private String industryName; @Excel(name = "行业级别", sort = 19, type = Excel.Type.ALL) private Integer industryLevel; - @Excel(name = "所属东财行业指数代码\n" + - "[行业类别]2级", sort = 20, type = Excel.Type.ALL) + @Excel(name = "所属东财行业指数代码2级", sort = 20, type = Excel.Type.ALL) private String industryCode; @Excel(name = "父行业代码", sort = 21, type = Excel.Type.ALL) private String parentCode;