diff --git a/air/src/main/java/com/air/land/controller/LandListedController.java b/air/src/main/java/com/air/land/controller/LandListedController.java
index c3f5128..247fe73 100644
--- a/air/src/main/java/com/air/land/controller/LandListedController.java
+++ b/air/src/main/java/com/air/land/controller/LandListedController.java
@@ -202,7 +202,7 @@ public class LandListedController {
      **/
     @ApiOperation(value = "导出已挂牌地块信息", notes = "导出已挂牌地块信息")
     @GetMapping("/exportLandListExcel")
-    public void exportLandListExcel(HttpServletResponse response, @RequestParam List<Long> ids) throws IOException {
+    public void exportLandListExcel(HttpServletResponse response, @RequestParam List<String> ids) throws IOException {
         List<List<String>> landList = landListedService.getLandList(ids);
         InputStream resourceAsStream = LandListedController.class.getClassLoader().getResourceAsStream("templates/excel/exportLandList.xlsx");
         // 读取excel模板
diff --git a/air/src/main/java/com/air/land/service/LandListedService.java b/air/src/main/java/com/air/land/service/LandListedService.java
index 8e31451..967c233 100644
--- a/air/src/main/java/com/air/land/service/LandListedService.java
+++ b/air/src/main/java/com/air/land/service/LandListedService.java
@@ -26,5 +26,5 @@ public interface LandListedService extends IService<LandListed> {
 
     boolean importLandListExcel(MultipartFile file);
 
-    List<List<String>> getLandList(List<Long> ids);
+    List<List<String>> getLandList(List<String> ids);
 }
diff --git a/air/src/main/java/com/air/land/service/impl/AuctionRecordServiceImpl.java b/air/src/main/java/com/air/land/service/impl/AuctionRecordServiceImpl.java
index 2d04418..fe03fbc 100644
--- a/air/src/main/java/com/air/land/service/impl/AuctionRecordServiceImpl.java
+++ b/air/src/main/java/com/air/land/service/impl/AuctionRecordServiceImpl.java
@@ -144,11 +144,11 @@ public class AuctionRecordServiceImpl extends ServiceImpl<AuctionRecordMapper, A
     }
 
     private String getCellPercent(XSSFCell cell) {
-        String price = getCellValue(cell);
-        if ("未举牌".equals(price)) {
-            return price;
+        String percent = getCellValue(cell);
+        if ("未举牌".equals(percent)) {
+            return percent;
         }
-        Double d = Double.valueOf(price);
+        Double d = Double.valueOf(percent);
         d = d * 100;
         return String.format("%.2f", d);
     }
diff --git a/air/src/main/java/com/air/land/service/impl/LandListedLonLatServiceImpl.java b/air/src/main/java/com/air/land/service/impl/LandListedLonLatServiceImpl.java
index 3036686..141d4c4 100644
--- a/air/src/main/java/com/air/land/service/impl/LandListedLonLatServiceImpl.java
+++ b/air/src/main/java/com/air/land/service/impl/LandListedLonLatServiceImpl.java
@@ -32,7 +32,7 @@ public class LandListedLonLatServiceImpl extends ServiceImpl<LandListedLonLatMap
         try{
             dataList = ExcelUtil.importExcel(file,0,1,0);
         }catch (IOException e){
-            new BusinessException("导入已挂牌经纬度数据出错");
+            throw new BusinessException("导入已挂牌经纬度数据出错");
         }
         List<LandListedLonLat> list = new ArrayList<>(dataList.size());
         dataList.forEach(data ->{
@@ -43,7 +43,7 @@ public class LandListedLonLatServiceImpl extends ServiceImpl<LandListedLonLatMap
                 }
             }catch (Exception e){
                 e.printStackTrace();
-                new BusinessException("导入已挂牌经纬度数据转换出错");
+               throw  new BusinessException("导入已挂牌经纬度数据转换出错");
             }
         });
         return this.saveBatch(list);
diff --git a/air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java b/air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java
index e311e8d..02827e7 100644
--- a/air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java
+++ b/air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java
@@ -1,7 +1,5 @@
 package com.air.land.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.air.land.dto.LandListedDto;
 import com.air.land.dto.LandListedStatisticsDto;
 import com.air.land.entity.LandListed;
@@ -9,18 +7,22 @@ import com.air.land.mapper.LandListedMapper;
 import com.air.land.service.LandListedService;
 import com.air.land.vo.LandListedAppletsVo;
 import com.air.utils.DateUtil;
-import com.air.utils.ExcelUtil;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cinderella.framework.common.core.exception.BusinessException;
 import com.cinderella.framework.common.core.util.R;
 import com.cinderella.framework.common.data.mybatis.QueryPage;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.time.format.DateTimeFormatter;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -30,6 +32,7 @@ import java.util.List;
  * @author peihao
  * @date 2021-05-18 09:39:59
  */
+@Slf4j
 @Service
 public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandListed> implements LandListedService {
 
@@ -57,29 +60,17 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
 
     @Override
     public boolean importLandListExcel(MultipartFile file) {
-        List<List<String>> dataList = new ArrayList<>();
-        try{
-            dataList = ExcelUtil.importExcel(file,0,2,0);
-        }catch (IOException e){
-            new BusinessException("导入已挂牌地块数据出错");
+        List<LandListed> dataList;
+        try {
+            dataList = importLandListedExcel(file);
+        } catch (IOException e) {
+            throw new BusinessException("导入已挂牌地块数据出错");
         }
-        List<LandListed> list = new ArrayList<>(dataList.size());
-        dataList.forEach(data ->{
-            try {
-                LandListed landListed = listToEntity(data);
-                if(ObjectUtil.isNotEmpty(landListed)){
-                    list.add(landListed);
-                }
-            }catch (Exception e){
-                e.printStackTrace();
-                new BusinessException("导入已挂牌地块数据转换出错");
-            }
-        });
-        return this.saveBatch(list);
+        return this.saveBatch(dataList);
     }
 
     @Override
-    public List<List<String>> getLandList(List<Long> ids) {
+    public List<List<String>> getLandList(List<String> ids) {
         List<LandListed> landListeds = this.listByIds(ids);
         List<List<String>> list = new ArrayList<>();
         landListeds.forEach(landListed -> {
@@ -88,87 +79,204 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
         return list;
     }
 
-    private LandListed listToEntity(List<String> data) {
-        LandListed landListed = new LandListed();
-        if(StrUtil.isNotEmpty(data.get(0)) && StrUtil.isNotEmpty(data.get(1))){
-            landListed.setAnnoId(data.get(0));
-            landListed.setLandCode(data.get(1));
-            landListed.setLandPosition(data.get(2));
-            landListed.setLandUsage(data.get(3));
-            landListed.setLandTransferSquare(data.get(4));
-            landListed.setLandTransferMu(data.get(5));
-            landListed.setTotalConsArea(data.get(6));
-            landListed.setPlotRatio(data.get(7));
-            landListed.setBuildingDensity(data.get(8));
-            landListed.setGreenSpaceRatio(data.get(9));
-            landListed.setHeighPermitted(data.get(10));
-            landListed.setRemiseYears(data.get(11));
-            landListed.setTransferPrice(data.get(12));
-            landListed.setStartingFloorPrice(data.get(13));
-            landListed.setBidMargin(data.get(14));
-            landListed.setBizRemark(data.get(15));
-            if(StrUtil.isNotEmpty(data.get(16))){
-                landListed.setAnnoDate(DateUtil.fromLocalDate(data.get(16),"yyyy-MM-dd"));
+    /**
+     * 导入地块数据
+     *
+     * @param file 导入文件
+     * @return
+     * @author peihao
+     * @date 2021/6/17
+     **/
+    public List<LandListed> importLandListedExcel(MultipartFile file) throws IOException {
+        // 读取excel模板
+        XSSFWorkbook wb = new XSSFWorkbook(file.getInputStream());
+        XSSFSheet sheet = wb.getSheetAt(0);
+        int rowSum = sheet.getPhysicalNumberOfRows();
+        //获取数据
+        List<LandListed> result = new ArrayList<>();
+        for (int i = 2; i < rowSum; i++) {
+            XSSFRow sheetRow = sheet.getRow(i);
+            LandListed landListed = new LandListed();
+            landListed.setLandListedId(DateUtil.landListedIdfromDate(LocalDateTime.now(), "yyyyMMddHHmmssSSS"));
+            landListed.setAnnoId(getCellValue(sheetRow.getCell(0)));
+            landListed.setLandCode(getCellStrValue(sheetRow.getCell(1)));
+            landListed.setLandPosition(getCellStrValue(sheetRow.getCell(2)));
+            landListed.setLandUsage(getCellStrValue(sheetRow.getCell(3)));
+            landListed.setLandTransferSquare(getCellValue(sheetRow.getCell(4)));
+            landListed.setLandTransferMu(stringNumberFormat("%.0f", getCellValue(sheetRow.getCell(5))));
+            landListed.setTotalConsArea(stringNumberFormat("%.0f", getCellValue(sheetRow.getCell(6))));
+            landListed.setPlotRatio(stringNumberFormat("%.1f", getCellValue(sheetRow.getCell(7))));
+            landListed.setBuildingDensity(getCellStrValue(sheetRow.getCell(8)));
+            landListed.setGreenSpaceRatio(getCellStrValue(sheetRow.getCell(9)));
+            landListed.setHeighPermitted(getCellStrValue(sheetRow.getCell(10)));
+            landListed.setRemiseYears(getCellStrValue(sheetRow.getCell(11)));
+            landListed.setTransferPrice(getCellStrValue(sheetRow.getCell(12)));
+            landListed.setStartingFloorPrice(stringNumberFormat("%.0f", getCellValue(sheetRow.getCell(13))));
+            landListed.setBidMargin(getCellStrValue(sheetRow.getCell(14)));
+            landListed.setBizRemark(getCellStrValue(sheetRow.getCell(15)));
+            try {
+                landListed.setAnnoDate(DateUtil.dateToLocalDate(sheetRow.getCell(16).getDateCellValue()));
+            } catch (Exception e) {
+                log.error("公告日期转换出错", e);
             }
-            if(StrUtil.isNotEmpty(data.get(17))){
-                landListed.setAuctionDate( DateUtil.fromLocalDate(data.get(17),"yyyy-MM-dd"));
+            try {
+                landListed.setAuctionDate(DateUtil.dateToLocalDate(sheetRow.getCell(17).getDateCellValue()));
+            } catch (Exception e) {
+                log.error("拍卖日期转换出错", e);
             }
-            landListed.setLicensedArea(data.get(18));
-            landListed.setBizSpace(data.get(19));
-            landListed.setCommerceSpace(data.get(20));
-            landListed.setRemark(data.get(21));
-            landListed.setAllocationCapacity(data.get(22));
-            landListed.setAllocationNotCapacity(data.get(23));
-            landListed.setGeologicHazard(data.get(24));
-            landListed.setCivilAirDefence(data.get(25));
-            landListed.setSpecialPlan(data.get(26));
-            landListed.setAssemblyBuilding(data.get(27));
-            landListed.setGreenBuilding(data.get(28));
-            landListed.setOtherConditions(data.get(29));
-            landListed.setPercentFinishedHousing(data.get(30));
-            landListed.setBiddingConditions(data.get(31));
-            landListed.setHookForm(data.get(32));
-            landListed.setFirstGovernance(data.get(33));
-            landListed.setLandEnterprises(data.get(33));
-            landListed.setPaymentRhythm(data.get(34));
-            landListed.setBargainor(data.get(35));
-            landListed.setCity(data.get(36));
-            landListed.setCanton(data.get(37));
-            landListed.setSpecialZone(data.get(38));
-            landListed.setLoopWire(data.get(39));
-            landListed.setBigGroup(data.get(40));
-            landListed.setSmallGroup(data.get(41));
-            landListed.setOvePosition(data.get(42));
-            landListed.setLonLatBd(data.get(43));
-            landListed.setAnnoId(data.get(44));
-            landListed.setLandPosition(data.get(45));
-            landListed.setTransferMode(data.get(46));
-            landListed.setAssignee(data.get(47));
-            landListed.setLandEnterpriseShort(data.get(48));
-            landListed.setDealPrice(data.get(49));
-            landListed.setPremiumRate(data.get(50));
-            landListed.setCommercialSelfRatio(data.get(51));
-            landListed.setHomeSelfRatio(data.get(52));
-            landListed.setPercentUnpaid(data.get(53));
-            landListed.setTalenApartmentArea(data.get(54));
-            landListed.setParticipatingEnterprises(data.get(55));
-            landListed.setProjectStatus(data.get(56));
-            landListed.setBuildingName(data.get(57));
-            landListed.setProjectCompany(data.get(58));
-            if(StrUtil.isNotEmpty(data.get(59))){
-                landListed.setConfirmationTime(DateUtil.fromLocalDate(data.get(59),"yyyy-MM-dd"));
+            landListed.setLicensedArea(stringNumberFormat("%.0f", getCellStrValue(sheetRow.getCell(18))));
+            landListed.setBizSpace(stringNumberFormat("%.0f", getCellStrValue(sheetRow.getCell(19))));
+            landListed.setCommerceSpace(stringNumberFormat("%.0f", getCellStrValue(sheetRow.getCell(20))));
+            //暂用位
+            /*landListed.setRemark(getCellValue(sheetRow.getCell(21)));*/
+            landListed.setAllocationCapacity(getCellStrValue(sheetRow.getCell(22)));
+            landListed.setAllocationNotCapacity(getCellStrValue(sheetRow.getCell(23)));
+            landListed.setGeologicHazard(getCellStrValue(sheetRow.getCell(24)));
+            landListed.setCivilAirDefence(stringNumberFormat("%.0f", getCellStrValue(sheetRow.getCell(25))));
+            landListed.setSpecialPlan(getCellStrValue(sheetRow.getCell(26)));
+            landListed.setAssemblyBuilding(getCellStrValue(sheetRow.getCell(27)));
+            landListed.setGreenBuilding(getCellStrValue(sheetRow.getCell(28)));
+            landListed.setOtherConditions(getCellStrValue(sheetRow.getCell(29)));
+            landListed.setPercentFinishedHousing(getCellStrValue(sheetRow.getCell(30)));
+            landListed.setBiddingConditions(getCellStrValue(sheetRow.getCell(31)));
+            landListed.setHookForm(getCellStrValue(sheetRow.getCell(32)));
+            landListed.setFirstGovernance(getCellStrValue(sheetRow.getCell(33)));
+            landListed.setLandEnterprises(getCellStrValue(sheetRow.getCell(34)));
+
+            landListed.setPaymentRhythm(getCellStrValue(sheetRow.getCell(35)));
+            landListed.setBargainor(getCellStrValue(sheetRow.getCell(36)));
+            landListed.setCity(getCellStrValue(sheetRow.getCell(37)));
+            landListed.setCanton(getCellStrValue(sheetRow.getCell(38)));
+            landListed.setSpecialZone(getCellStrValue(sheetRow.getCell(39)));
+            landListed.setLoopWire(getCellStrValue(sheetRow.getCell(40)));
+            landListed.setBigGroup(getCellStrValue(sheetRow.getCell(41)));
+            landListed.setSmallGroup(getCellStrValue(sheetRow.getCell(42)));
+            landListed.setOvePosition(getCellStrValue(sheetRow.getCell(43)));
+            landListed.setLonLatBd(getCellStrValue(sheetRow.getCell(44)));
+            /*landListed.setAnnoId(getCellValue(sheetRow.getCell(45)));
+            landListed.setLandPosition(getCellValue(sheetRow.getCell(46)));*/
+            landListed.setTransferMode(getCellStrValue(sheetRow.getCell(47)));
+            landListed.setAssignee(getCellStrValue(sheetRow.getCell(48)));
+            landListed.setLandEnterpriseShort(getCellStrValue(sheetRow.getCell(49)));
+            landListed.setDealPrice(getCellStrValue(sheetRow.getCell(50)));
+            landListed.setPremiumRate(stringNumberFormat("%.1f", getCellValue(sheetRow.getCell(51)), 100));
+            landListed.setCommercialSelfRatio(getCellStrValue(sheetRow.getCell(52)));
+            landListed.setHomeSelfRatio(getCellStrValue(sheetRow.getCell(53)));
+            landListed.setPercentUnpaid(getCellStrValue(sheetRow.getCell(54)));
+            landListed.setTalenApartmentArea(getCellStrValue(sheetRow.getCell(55)));
+            landListed.setParticipatingEnterprises(getCellStrValue(sheetRow.getCell(56)));
+            landListed.setProjectStatus(getCellStrValue(sheetRow.getCell(57)));
+            landListed.setBuildingName(getCellStrValue(sheetRow.getCell(58)));
+            landListed.setProjectCompany(getCellStrValue(sheetRow.getCell(59)));
+            try {
+                landListed.setConfirmationTime(DateUtil.dateToLocalDate(sheetRow.getCell(60).getDateCellValue()));
+            } catch (Exception e) {
+                log.error("确权时间转换出错", e);
             }
-            landListed.setTradingEnterprises(data.get(60));
-            landListed.setPartner(data.get(61));
-            landListed.setConductEnterprise(data.get(62));
-            if(StrUtil.isNotEmpty(data.get(63))){
-                landListed.setFirstOpenTime(DateUtil.fromLocalDate(data.get(63),"yyyy-MM-dd"));
+            landListed.setTradingEnterprises(getCellStrValue(sheetRow.getCell(61)));
+            landListed.setPartner(getCellStrValue(sheetRow.getCell(62)));
+            landListed.setConductEnterprise(getCellValue(sheetRow.getCell(63)));
+            try {
+                landListed.setFirstOpenTime(DateUtil.dateToLocalDate(sheetRow.getCell(64).getDateCellValue()));
+            } catch (Exception e) {
+                log.error("项目首开时间转换出错", e);
             }
-            return landListed;
+            result.add(landListed);
+        }
+        return result;
+    }
+
+    /**
+     * 获取有计算公式列的值
+     *
+     * @param cell
+     * @return
+     * @author peihao
+     * @date 2021/6/25
+     **/
+    private String getCellValue(XSSFCell cell) {
+        String value;
+        try {
+            value = cell.getRawValue();
+        } catch (IllegalStateException e) {
+            value = cell.toString();
+        }
+        return valueFormat(value);
+    }
+
+    /**
+     * 获取没有计算公式列的值
+     *
+     * @param cell
+     * @return
+     * @author peihao
+     * @date 2021/6/25
+     **/
+    private String getCellStrValue(XSSFCell cell) {
+        String value = null;
+        try {
+            value = cell.toString();
+        } catch (IllegalStateException e) {
+            e.printStackTrace();
+        }
+        return valueFormat(value);
+    }
+
+    /**
+     * 格式化列的值
+     *
+     * @param value
+     * @return
+     * @author peihao
+     * @date 2021/6/25
+     **/
+    private String valueFormat(String value) {
+        value = StringUtils.isNotEmpty(value) ? value.trim() : value;
+        value = StringUtils.equals("-", value) ? "" : value;
+        return value;
+    }
+
+    /**
+     * 格式化列的值
+     *
+     * @param partten 格式
+     * @param value   数据
+     * @return
+     * @author peihao
+     * @date 2021/6/25
+     **/
+    private String stringNumberFormat(String partten, String value) {
+        if (StringUtils.isEmpty(value)) {
+            return "";
+        }
+        return String.format(partten, Double.valueOf(value));
+    }
+
+    /**
+     * 格式化列的值（倍数）
+     *
+     * @param partten  格式
+     * @param value    数据
+     * @param multiple 倍数
+     * @return
+     * @author peihao
+     * @date 2021/6/25
+     **/
+    private String stringNumberFormat(String partten, String value, int multiple) {
+        if (StringUtils.isEmpty(value)) {
+            return "";
         }
-        return null;
+        return String.format(partten, Double.valueOf(value) * multiple);
     }
 
+    /**
+     * 数据导出 对象转换
+     *
+     * @param data
+     * @return
+     * @author peihao
+     * @date 2021/6/25
+     **/
     private List<String> entityToList(LandListed data) {
         List<String> list = new ArrayList<>();
         list.add(data.getAnnoId());
@@ -187,8 +295,8 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
         list.add(data.getStartingFloorPrice());
         list.add(data.getBidMargin());
         list.add(data.getBizRemark());
-        list.add(DateUtil.fromString(data.getAnnoDate(),"yyyy-MM-dd"));
-        list.add(DateUtil.fromString(data.getAuctionDate(),"yyyy-MM-dd"));
+        list.add(DateUtil.fromString(data.getAnnoDate(), "yyyy-MM-dd"));
+        list.add(DateUtil.fromString(data.getAuctionDate(), "yyyy-MM-dd"));
         list.add(data.getLicensedArea());
         list.add(data.getBizSpace());
         list.add(data.getCommerceSpace());
@@ -231,11 +339,11 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
         list.add(data.getProjectStatus());
         list.add(data.getBuildingName());
         list.add(data.getProjectCompany());
-        list.add(DateUtil.fromString(data.getConfirmationTime(),"yyyy-MM-dd"));
+        list.add(DateUtil.fromString(data.getConfirmationTime(), "yyyy-MM-dd"));
         list.add(data.getTradingEnterprises());
         list.add(data.getPartner());
         list.add(data.getConductEnterprise());
-        list.add(DateUtil.fromString(data.getFirstOpenTime(),"yyyy-MM-dd"));
+        list.add(DateUtil.fromString(data.getFirstOpenTime(), "yyyy-MM-dd"));
         return list;
         /*ExportLandListedDto listedDto = new ExportLandListedDto();
         BeanUtil.copyProperties(data,listedDto);
diff --git a/air/src/main/java/com/air/land/service/impl/LandToListLonLatServiceImpl.java b/air/src/main/java/com/air/land/service/impl/LandToListLonLatServiceImpl.java
index a07fa2c..cab4080 100644
--- a/air/src/main/java/com/air/land/service/impl/LandToListLonLatServiceImpl.java
+++ b/air/src/main/java/com/air/land/service/impl/LandToListLonLatServiceImpl.java
@@ -31,7 +31,7 @@ public class LandToListLonLatServiceImpl extends ServiceImpl<LandToListLonLatMap
         try{
             dataList = ExcelUtil.importExcel(file,0,1,0);
         }catch (IOException e){
-            new BusinessException("导入拟挂牌经纬度数据出错");
+           throw new BusinessException("导入拟挂牌经纬度数据出错");
         }
         List<LandToListLonLat> list = new ArrayList<>(dataList.size());
         dataList.forEach(data ->{
@@ -42,7 +42,7 @@ public class LandToListLonLatServiceImpl extends ServiceImpl<LandToListLonLatMap
                 }
             }catch (Exception e){
                 e.printStackTrace();
-                new BusinessException("导入拟挂牌经纬度数据转换出错");
+                throw new BusinessException("导入拟挂牌经纬度数据转换出错");
             }
         });
         return this.saveBatch(list);
diff --git a/air/src/main/java/com/air/land/service/impl/LandToListServiceImpl.java b/air/src/main/java/com/air/land/service/impl/LandToListServiceImpl.java
index 5dab9f4..9e4778a 100644
--- a/air/src/main/java/com/air/land/service/impl/LandToListServiceImpl.java
+++ b/air/src/main/java/com/air/land/service/impl/LandToListServiceImpl.java
@@ -67,7 +67,7 @@ public class LandToListServiceImpl extends ServiceImpl<LandToListMapper, LandToL
         try{
             dataList = ExcelUtil.importExcel(file,0,2,0);
         }catch (IOException e){
-            new BusinessException("导入已挂牌地块数据出错");
+           throw new BusinessException("导入已挂牌地块数据出错");
         }
         List<LandToList> list = new ArrayList<>(dataList.size());
         dataList.forEach(data ->{
@@ -78,7 +78,7 @@ public class LandToListServiceImpl extends ServiceImpl<LandToListMapper, LandToL
                 }
             }catch (Exception e){
                 e.printStackTrace();
-                new BusinessException("导入已挂牌地块数据转换出错");
+               throw new BusinessException("导入已挂牌地块数据转换出错");
             }
         });
         return this.saveBatch(list);
diff --git a/air/src/main/java/com/air/utils/DateUtil.java b/air/src/main/java/com/air/utils/DateUtil.java
index d950f7f..5970102 100644
--- a/air/src/main/java/com/air/utils/DateUtil.java
+++ b/air/src/main/java/com/air/utils/DateUtil.java
@@ -5,6 +5,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
@@ -62,6 +63,20 @@ public class DateUtil {
         return LocalDate.parse(dateString, fmt);
     }
 
+    /**
+     * date转 LocalDate
+     * @author peihao
+     * @param date 时间
+     * @date 2020/6/28
+     * @return
+     **/
+    public static LocalDate dateToLocalDate(Date date) {
+        if(null == date) {
+            return null;
+        }
+        return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+    }
+
     /**
      * 字符串转时间
      * @author peihao
diff --git a/air/src/main/java/com/air/utils/ExcelUtil.java b/air/src/main/java/com/air/utils/ExcelUtil.java
index cccd7d0..ff67777 100644
--- a/air/src/main/java/com/air/utils/ExcelUtil.java
+++ b/air/src/main/java/com/air/utils/ExcelUtil.java
@@ -1,5 +1,6 @@
 package com.air.utils;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -22,11 +23,12 @@ public class ExcelUtil {
 
     /**
      * 已挂牌地块数据导出
-     * @author peihao
-     * @param dataList 导出数据
+     *
+     * @param dataList    导出数据
      * @param inputStream 模板流
-     * @date 2021/6/17
      * @return
+     * @author peihao
+     * @date 2021/6/17
      **/
     public static XSSFWorkbook exportLandListedExcel(List<List<String>> dataList, InputStream inputStream) throws IOException {
         // 读取excel模板
@@ -46,15 +48,16 @@ public class ExcelUtil {
 
     /**
      * 导入数据
-     * @author peihao
-     * @param file 导入文件
+     *
+     * @param file       导入文件
      * @param startSheet 第几个sheet
-     * @param startRow 开始读取行
-     * @param startCell 开始读取列
-     * @date 2021/6/17
+     * @param startRow   开始读取行
+     * @param startCell  开始读取列
      * @return
+     * @author peihao
+     * @date 2021/6/17
      **/
-    public static List<List<String>> importExcel(MultipartFile file,int startSheet,int startRow, int startCell) throws IOException {
+    public static List<List<String>> importExcel(MultipartFile file, int startSheet, int startRow, int startCell) throws IOException {
         // 读取excel模板
         XSSFWorkbook wb = new XSSFWorkbook(file.getInputStream());
         XSSFSheet sheet = wb.getSheetAt(startSheet);
@@ -70,9 +73,11 @@ public class ExcelUtil {
                 try {
                     cell.getCellFormula();
                     value = cell.getRawValue();
-                }catch (IllegalStateException e){
+                } catch (IllegalStateException e) {
                     value = cell.toString();
                 }
+                value = StringUtils.isNotEmpty(value) ? value.trim() : value;
+                value = StringUtils.equals("-", value) ? "" : value;
                 list.add(value);
             }
             result.add(list);
@@ -81,8 +86,4 @@ public class ExcelUtil {
         return result;
     }
 
-
-
-
-
 }