excel 工具类位置调整

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -26,8 +26,8 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.common.utils.excel.util.ExcelUtil;
 import com.fjhx.file.utils.ObsFileUtil;
-import com.fjhx.item.util.excel.util.ExcelUtil;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;

hx-common/pom.xml

@@ -26,6 +26,10 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

hx-item/src/main/java/com/fjhx/item/util/excel/ExcelImgUtils.java → hx-common/src/main/java/com/fjhx/common/utils/excel/ExcelImgUtils.java

@@ -1,4 +1,4 @@
-package com.fjhx.item.util.excel;
+package com.fjhx.common.utils.excel;
 
 import com.alibaba.excel.metadata.data.ImageData;
 import com.alibaba.excel.metadata.data.WriteCellData;

hx-item/src/main/java/com/fjhx/item/util/excel/listener/DataListener.java → hx-common/src/main/java/com/fjhx/common/utils/excel/listener/DataListener.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.fjhx.item.util.excel.listener;
+package com.fjhx.common.utils.excel.listener;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;

hx-item/src/main/java/com/fjhx/item/util/excel/listener/ImportListener.java → hx-common/src/main/java/com/fjhx/common/utils/excel/listener/ImportListener.java

@@ -14,11 +14,11 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.fjhx.item.util.excel.listener;
+package com.fjhx.common.utils.excel.listener;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
-import com.fjhx.item.util.excel.support.ExcelImporter;
+import com.fjhx.common.utils.excel.support.ExcelImporter;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;

hx-item/src/main/java/com/fjhx/item/util/excel/support/ExcelException.java → hx-common/src/main/java/com/fjhx/common/utils/excel/support/ExcelException.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.fjhx.item.util.excel.support;
+package com.fjhx.common.utils.excel.support;
 
 /**
  * Excel异常处理类

hx-item/src/main/java/com/fjhx/item/util/excel/support/ExcelImporter.java → hx-common/src/main/java/com/fjhx/common/utils/excel/support/ExcelImporter.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.fjhx.item.util.excel.support;
+package com.fjhx.common.utils.excel.support;
 
 import java.util.List;
 

hx-item/src/main/java/com/fjhx/item/util/excel/util/ExcelUtil.java → hx-common/src/main/java/com/fjhx/common/utils/excel/util/ExcelUtil.java

@@ -14,17 +14,17 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.fjhx.item.util.excel.util;
+package com.fjhx.common.utils.excel.util;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.read.builder.ExcelReaderBuilder;
 import com.alibaba.excel.read.listener.ReadListener;
 import com.alibaba.excel.util.DateUtils;
 import com.alibaba.excel.write.handler.WriteHandler;
-import com.fjhx.item.util.excel.listener.DataListener;
-import com.fjhx.item.util.excel.listener.ImportListener;
-import com.fjhx.item.util.excel.support.ExcelException;
-import com.fjhx.item.util.excel.support.ExcelImporter;
+import com.fjhx.common.utils.excel.listener.DataListener;
+import com.fjhx.common.utils.excel.listener.ImportListener;
+import com.fjhx.common.utils.excel.support.ExcelException;
+import com.fjhx.common.utils.excel.support.ExcelImporter;
 import lombok.SneakyThrows;
 import org.apache.commons.codec.Charsets;
 import org.springframework.util.ObjectUtils;

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -18,6 +18,8 @@ import com.fjhx.common.entity.AvailableStockBo;
 import com.fjhx.common.service.file.FtpFileService;
 import com.fjhx.common.service.file.impl.FtpFileServiceImpl;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.common.utils.excel.ExcelImgUtils;
+import com.fjhx.common.utils.excel.util.ExcelUtil;
 import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.item.entity.product.ProcessesBo;
@@ -34,8 +36,6 @@ import com.fjhx.item.enums.ProductAvailableRecordType;
 import com.fjhx.item.mapper.product.ProductInfoMapper;
 import com.fjhx.item.service.product.*;
 import com.fjhx.item.util.CodeEnum;
-import com.fjhx.item.util.excel.ExcelImgUtils;
-import com.fjhx.item.util.excel.util.ExcelUtil;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/SaleAccountRunningWaterServiceImpl.java

@@ -1,48 +1,16 @@
 package com.fjhx.sale.service.claim.impl;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.account.entity.account.bo.AccountRunningWaterBo;
-import com.fjhx.account.entity.account.dto.AccountRunningWaterDto;
 import com.fjhx.account.entity.account.dto.AccountRunningWaterSelectDto;
-import com.fjhx.account.entity.account.po.AccountManagement;
-import com.fjhx.account.entity.account.po.AccountRemainder;
-import com.fjhx.account.entity.account.po.AccountRunningWater;
 import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
-import com.fjhx.account.entity.tax.po.TaxRefundDetails;
-import com.fjhx.account.mapper.account.AccountRunningWaterMapper;
-import com.fjhx.account.service.account.AccountManagementService;
-import com.fjhx.account.service.account.AccountRemainderService;
 import com.fjhx.account.service.account.AccountRunningWaterService;
-import com.fjhx.account.service.tax.TaxRefundDetailsService;
-import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.common.entity.corporation.po.Corporation;
-import com.fjhx.common.service.corporation.CorporationService;
-import com.fjhx.common.utils.Assert;
-import com.fjhx.common.utils.ExchangeRateUtil;
-import com.fjhx.item.util.excel.util.ExcelUtil;
 import com.fjhx.sale.service.claim.ClaimContractService;
 import com.fjhx.sale.service.claim.SaleAccountRunningWaterService;
-import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
-import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
-import com.fjhx.tenant.service.dict.DictTenantDataService;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.List;
 
 
 /**

hx-wms/src/main/java/com/fjhx/wms/service/monthly/impl/MonthlyInventoryReportServiceImpl.java

@@ -6,9 +6,9 @@ import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.utils.excel.util.ExcelUtil;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.item.util.excel.util.ExcelUtil;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;

pom.xml

@@ -120,6 +120,12 @@
                 <version>${hx.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>easyexcel</artifactId>
+                <version>3.2.1</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>