From 33f4541719f5bf8f98616e3bcfcae1c416c69551 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 30 十一月 2023 13:29:32 +0800
Subject: [PATCH] 调拨出入库导出

---
 admin-web/src/api/exportExcel.js                                                    |    2 
 consum-base/src/main/java/com/consum/base/pojo/ProjectTreeResult.java               |    4 +
 consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelExport.java       |    4 +
 consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java   |   20 +++++-
 deploy-jar-single/src/main/resources/import/调拨入库单.xls                               |    0 
 consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java   |   16 +----
 consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java     |    9 ++-
 consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java        |    9 ++-
 deploy-jar-single/src/main/resources/import/调拨出库单.xls                               |    0 
 consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java |   28 ++++++---
 consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelTransfer.java     |    2 
 /dev/null                                                                           |    0 
 consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java    |    2 
 consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java  |    2 
 consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java  |   45 ---------------
 consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java      |   14 +++-
 16 files changed, 74 insertions(+), 83 deletions(-)

diff --git a/admin-web/src/api/exportExcel.js b/admin-web/src/api/exportExcel.js
index 28ae9c2..49a60dc 100644
--- a/admin-web/src/api/exportExcel.js
+++ b/admin-web/src/api/exportExcel.js
@@ -12,7 +12,7 @@
 // 閲囪喘鍗曞鍑�
 export function procureExport(params) {
     return request({
-        url: '/pc/l/wh/form/procure/list/export',
+        url: '/pc/whForm/procure/list/export',
         responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
         method: 'get',
         params,
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
index 4cea9f8..44f8030 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseCategoryController.java
@@ -12,6 +12,7 @@
 import com.walker.infrastructure.tree.TreeNode;
 import com.walker.infrastructure.utils.StringUtils;
 import com.walker.web.ResponseValue;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,7 @@
  * @Author 鍗㈠簡闃�
  * @Date 2023/10/23
  */
+@Api(value = "鐗╁搧鍒嗙被", tags = "鐗╁搧鍒嗙被")
 @RestController
 @RequestMapping("/pc/base/category")
 public class BaseCategoryController extends BaseController {
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index 4cceb53..0143c76 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -226,17 +226,11 @@
         }
 
         Workbook workbook = ExcelExportUtil.exportExcel(params, map);
-        downLoadExcel("111", response, workbook);
+        downLoadExcel("閲囪喘閫�璐у崟", response, workbook);
 
-//        try (OutputStream outputStream = response.getOutputStream()) {
-//            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
-//            response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("閲囪喘閫�璐у崟1.xlsx", "utf-8"));
-//            workbook.write(outputStream);
-//            workbook.close();
-//        }
     }
 
-    private void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) throws IOException {
+    private void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) {
         try (OutputStream out = response.getOutputStream()) {
             response.setCharacterEncoding("UTF-8");
             response.setHeader("content-Type", "application/vnd.ms-excel");
@@ -246,11 +240,7 @@
             response.setHeader("Content-Length", String.valueOf(baos.size()));
             out.write(baos.toByteArray());
         } catch (Exception e) {
-            try {
-                throw new Exception(e.getMessage());
-            } catch (Exception e1) {
-                e1.printStackTrace();
-            }
+            logger.error("瀵煎嚭鏂囦欢澶辫触", e);
         }
     }
 
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index 89306ef..f621b84 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -424,7 +424,7 @@
     @GetMapping("/list/export")
     public void export(Long id, HttpServletResponse response) throws IOException {
         TemplateExportParams params = new TemplateExportParams(
-            "import/閲囪喘鍏ュ簱鍗�.xlsx");
+            "import/閲囪喘鍏ュ簱鍗�.xls");
 
         FinSysTenantUser sysInfo = this.getSysInfo();
         String userName = sysInfo.getUserName();
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index dab1821..af3e13f 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -21,7 +21,6 @@
 import com.consum.base.pojo.response.FromTransferTemplateInfoVO;
 import com.consum.base.pojo.response.LWHFromTransferExtendVO;
 import com.consum.base.pojo.response.TransferInfoVO;
-import com.consum.base.service.BaseGoodsModelsServiceImpl;
 import com.consum.base.service.BaseWarehouseServiceImpl;
 import com.consum.base.service.LWhFormTransferCoreService;
 import com.consum.base.service.LWhFormTransferServiceImpl;
@@ -47,6 +46,7 @@
 import java.lang.reflect.Field;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -82,8 +82,6 @@
     private LWhProcureModelUserServiceImpl lWhProcureModelUserService;
     @Autowired
     private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
-    @Autowired
-    private BaseGoodsModelsServiceImpl baseGoodsModelsService;
     @Autowired
     private BaseWarehouseServiceImpl baseWarehouseService;
 
@@ -308,16 +306,21 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/31
      */
-    @GetMapping("/export")
-    public void export(Long id, HttpServletResponse response) throws IOException {
+    @GetMapping("/list/export")
+    public void export(Long id, Integer type, HttpServletResponse response) throws IOException {
 
-        TemplateExportParams params = new TemplateExportParams("import/璋冩嫧鍏ュ簱鍗�.xlsx");
-        Map<String, Object> map = this.lWhFormTransferService.export(id);
+        TemplateExportParams params;
+        if (type == 1) {
+            params = new TemplateExportParams("import/璋冩嫧鍏ュ簱鍗�.xls");
+        } else {
+            params = new TemplateExportParams("import/璋冩嫧鍑哄簱鍗�.xls");
+        }
+        Map<String, Object> map = this.lWhFormTransferService.export(id, type);
 
         Workbook workbook = ExcelExportUtil.exportExcel(params, map);
         try (OutputStream outputStream = response.getOutputStream()) {
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
-            response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("璋冩嫧鍏ュ簱鍗�.xlsx", "utf-8"));
+            response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("璋冩嫧鍏ュ簱鍗�.xls", "utf-8"));
             workbook.write(outputStream);
             workbook.close();
         }
@@ -432,7 +435,7 @@
         if (CollectionUtils.isEmpty(useRecordDTOList)) {
             return ResponseValue.error("鏈煡璇㈠埌浣跨敤璁板綍");
         }
-        List<GoodsUseRecordVO> result = Lists.newArrayList();
+        List<GoodsUseRecordVO> goodsUseRecordList = Lists.newArrayList();
         //鍒嗙粍
         Map<Long, Map<Long, List<UseRecordDTO>>> collect = useRecordDTOList.stream()
             .collect(Collectors.groupingBy(UseRecordDTO::getId, Collectors.groupingBy(UseRecordDTO::getBaseGoodsModelsId)));
@@ -466,10 +469,15 @@
                     useRecordSkuVO.setRecordUserInfos(recordUserInfoList);
                     useRecordSkuList.add(useRecordSkuVO);
                     goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
-                    result.add(goodsUseRecordVO);
+                    goodsUseRecordList.add(goodsUseRecordVO);
                 }
             }
         }
+        //鍒嗙粍涔嬪悗閲嶆柊鎺掑簭
+        List<GoodsUseRecordVO> result = goodsUseRecordList.stream()
+            .sorted(Comparator.comparing(GoodsUseRecordVO::getUpdateTime
+                , Comparator.nullsFirst(Long::compareTo)).reversed())
+            .collect(Collectors.toList());
         return ResponseValue.success(result);
     }
 
diff --git a/consum-base/src/main/java/com/consum/base/pojo/ProjectTreeResult.java b/consum-base/src/main/java/com/consum/base/pojo/ProjectTreeResult.java
index 0de6fef..7823342 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/ProjectTreeResult.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/ProjectTreeResult.java
@@ -4,11 +4,13 @@
 import com.walker.web.param.ParamRequest;
 import java.util.List;
 import lombok.Data;
+import lombok.ToString;
 
 @Data
+@ToString
 public class ProjectTreeResult extends ParamRequest {
 
-    List<ProjectTreeResult> children;
+    List<ProjectTreeResult> children = null;
 
     private Long id;
 
diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelExport.java b/consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelExport.java
index b182d06..225fac6 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelExport.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelExport.java
@@ -29,4 +29,8 @@
     private int price;
 
     private String warehouseName;
+
+    private Long createTime;
+
+    private String operatorName;
 }
diff --git a/consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelTransfer.java b/consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelTransfer.java
index 6efff92..8b2a64c 100644
--- a/consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelTransfer.java
+++ b/consum-base/src/main/java/com/consum/base/pojo/excel/TemplateExcelTransfer.java
@@ -14,7 +14,9 @@
     private String businessFormCode;
     private String operatorName;
     private Long createTime;
+    private String inAgencyName;
     private String outAgencyName;
+    private String tenantName;
     private String goodsName;
     private String baseGoodsModelsName;
     private Integer num;
diff --git a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
index 337af22..8ccb9f5 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseCategoryServiceImpl.java
@@ -1,9 +1,9 @@
 package com.consum.base.service;
 
 import com.consum.base.Constants;
+import com.consum.base.core.utils.IdUtil;
 import com.consum.base.pojo.BaseCategoryParam;
 import com.consum.base.pojo.ProjectTreeResult;
-import com.consum.base.core.utils.IdUtil;
 import com.consum.model.po.BaseCategory;
 import com.iplatform.model.po.S_user_core;
 import com.walker.db.page.GenericPager;
@@ -177,7 +177,11 @@
         //1绾у垎绫�
         List<ProjectTreeResult> menus = all.stream().filter(entity -> entity.getLevels() == 1).map(entity -> {
             ProjectTreeResult projectTreeResult = new ProjectTreeResult(entity);
-            projectTreeResult.setChildren(getChildren(projectTreeResult, all));
+            if (getChildren(projectTreeResult, all).isEmpty()) {
+                projectTreeResult.setChildren(null);
+            } else {
+                projectTreeResult.setChildren(getChildren(projectTreeResult, all));
+            }
             return projectTreeResult;
         }).sorted(Comparator.comparingInt(menu -> (menu.getSort() == null ? 0 : menu.getSort()))).collect(Collectors.toList());
         return menus;
@@ -192,7 +196,11 @@
 
             ProjectTreeResult projectTreeResult = new ProjectTreeResult(entity);
             //閫氳繃閫掑綊鎵惧埌瀛愬垎绫�
-            projectTreeResult.setChildren(getChildren(projectTreeResult, all));
+            if (getChildren(projectTreeResult, all).isEmpty()) {
+                projectTreeResult.setChildren(null);
+            } else {
+                projectTreeResult.setChildren(getChildren(projectTreeResult, all));
+            }
             return projectTreeResult;
         }).sorted(Comparator.comparingInt(menu -> (menu.getSort() == null ? 0 : menu.getSort()))).collect(Collectors.toList());
         return children;
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
index 79c9669..bb7ee4f 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
@@ -225,51 +225,6 @@
         return 1;
     }
 
-    /**
-     * 瀹屾垚鐩樼偣
-     *
-     * @author 鍗㈠簡闃�
-     * @date 2023/10/31
-     */
-//    public int finishPd(LWhFormInventoryParam dto) {
-//        //1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
-//        LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(dto.getId()));
-//        if (lWhFormInventory == null) {
-//            log.error("鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗� 澶辫触");
-//            return 0;
-//        }
-//        //2.淇敼鐩樼偣鍗�
-//        lWhFormInventory.setStates(2);
-//        lWhFormInventory.setStopTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-//        int flag1 = this.update(lWhFormInventory);
-//        if (flag1 == 0) {
-//            log.error("淇敼鐩樼偣鍗� 澶辫触");
-//            return 0;
-//        }
-//        //3.鏇存柊鐩樼偣鍗曠墿鍝�
-//        List<LWhFormInventoryGoods> inventoryGoodsList = dto.getInventoryGoodsList();
-//        if (CollectionUtils.isEmpty(inventoryGoodsList)) {
-//            log.error("鐩樼偣鍗曠墿鍝� 涓虹┖");
-//            return 0;
-//        }
-//        for (LWhFormInventoryGoods inventoryGoods : inventoryGoodsList) {
-//            int errorCounts = inventoryGoods.getInitCounts() - inventoryGoods.getInventoryCounts();
-//            if (errorCounts > 0) {
-//                inventoryGoods.setInventoryResult(3);
-//            } else if (errorCounts < 0) {
-//                inventoryGoods.setInventoryResult(2);
-//            } else {
-//                inventoryGoods.setInventoryResult(1);
-//            }
-//            inventoryGoods.setErrorCounts(Math.abs(errorCounts));
-//        }
-//        int flag2 = inventoryGoodsService.update(inventoryGoodsList);
-//        if (flag2 != inventoryGoodsList.size()) {
-//            log.error("鏇存柊鐩樼偣鍗曠墿鍝� 澶辫触");
-//            return 0;
-//        }
-//        return 1;
-//    }
 
     /**
      * @return
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
index 4d8a13c..b022376 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputServiceImpl.java
@@ -239,6 +239,8 @@
             + "\tpm.BASE_GOODS_MODELS_NAME goodsModeName,\n"
             + "\tcounts num,\n"
             + "\ttotal_amount totalAmount,\n"
+            + "\tfo.DEAL_TIME createTime,\n"
+            + "\tfo.OPERATOR_NAME,\n"
             + "\tBEIZ remark\n"
             + "FROM\n"
             + "\tl_wh_procure_model pm\n"
@@ -268,12 +270,13 @@
         Optional<TemplateExcelExport> first = list.stream().findFirst();
         TemplateExcelExport templateExcelExport = first.get();
         String businessFormCode = templateExcelExport.getBusinessFormCode();
+        Long createTime = templateExcelExport.getCreateTime();
+        String operatorName = templateExcelExport.getOperatorName();
 
-        String dateForHuman = DateUtils.getDateForHuman(System.currentTimeMillis());
         Map<String, Object> map = new HashMap<>();
         map.put("code", businessFormCode);
-        map.put("date", dateForHuman);
-        map.put("name", userName);
+        map.put("date", DateUtils.toShowDate(createTime));
+        map.put("name", operatorName);
         map.put("sum", sum);
         map.put("totalAmount", totalAmount);
         map.put("data", list);
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
index a3b1464..de10f94 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
@@ -124,6 +124,8 @@
         String sql = "SELECT\n"
             + "\tfp.BUSINESS_FORM_CODE,\n"
             + "\tfp.AGENCY_NAME tenantName,\n"
+            + "\tfp.INCOME_TIME createTime,\n"
+            + "\tfp.INCOME_NAME operatorName,\n"
             + "\tGOODS_NAME goodsName,\n"
             + "\tpm.BASE_GOODS_MODELS_NAME goodsModeName,\n"
             + "\tcounts num,\n"
@@ -159,12 +161,13 @@
         Optional<TemplateExcelExport> first = list.stream().findFirst();
         TemplateExcelExport templateExcelExport = first.get();
         String businessFormCode = templateExcelExport.getBusinessFormCode();
+        Long createTime = templateExcelExport.getCreateTime();
+        String operatorName = templateExcelExport.getOperatorName();
 
-        String dateForHuman = DateUtils.getDateForHuman(System.currentTimeMillis());
         Map<String, Object> map = new HashMap<>();
         map.put("code", businessFormCode);
-        map.put("date", dateForHuman);
-        map.put("name", userName);
+        map.put("date", DateUtils.toShowDate(createTime));
+        map.put("name", operatorName);
         map.put("sum", sum);
         map.put("totalAmount", totalAmount);
         map.put("data", list);
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
index df5197e..bd531dd 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
@@ -197,6 +197,9 @@
                     int goodsNum = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
                     lWhProcureModel.setWorehouseCount(goodsNum);
                 }
+                if (businessType == 1) {
+                    lWhProcureModel.setBusinessType(4);
+                }
                 lWhProcureModel.setCounts(model.getCounts());
                 lWhProcureModel.setBusinessId(lWhFormTransferId);
                 lWhProcureModel.setBaseGoodsModelsId(baseGoodsModelsId);
@@ -213,7 +216,6 @@
                 // 鍗曟嵁绫诲瀷 1 閲囪喘2 璋冩嫧 3鍑哄簱4閮ㄩ棬鍒嗗彂
                 //閮ㄩ棬鍒嗗彂绫诲瀷
                 if (businessType == 1 && "A".equals(baseModelMap.get("type"))) {
-                    lWhProcureModel.setBusinessType(4);
                     LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
                     lWhProcureModelUserRecord.setId(IdUtil.generateId());
                     lWhProcureModelUserRecord.setTransBusinessId(lWhFormTransferId);
@@ -404,11 +406,12 @@
      * @Author 鍗㈠簡闃�
      * @Date 2023/10/31
      */
-    public Map<String, Object> export(Long id) {
+    public Map<String, Object> export(Long id, Integer type) {
         String sql = "SELECT\n"
             + "\tft.BUSINESS_FORM_CODE,\n"
             + "\tft.OPERATOR_NAME,\n"
             + "\tft.CREATE_TIME,\n"
+            + "\tft.IN_AGENCY_NAME,\n"
             + "\tft.OUT_AGENCY_NAME,\n"
             + "\tGOODS_NAME,\n"
             + "\tpm.BASE_GOODS_MODELS_NAME,\n"
@@ -429,6 +432,11 @@
         List<TemplateExcelTransfer> list = Lists.newArrayList();
         select.forEach(item -> {
             TemplateExcelTransfer templateExcelTransfer = MapUtils.convertMapToObj(item, TemplateExcelTransfer.class);
+            if (type == 1) {
+                templateExcelTransfer.setTenantName(templateExcelTransfer.getOutAgencyName());
+            } else {
+                templateExcelTransfer.setTenantName(templateExcelTransfer.getInAgencyName());
+            }
             list.add(templateExcelTransfer);
         });
 
@@ -439,10 +447,16 @@
         String businessFormCode = entity.getBusinessFormCode();
         Long createTime = entity.getCreateTime();
         String operatorName = entity.getOperatorName();
-
+        String tenantName;
+        if (type == 1) {
+            tenantName = entity.getInAgencyName();
+        } else {
+            tenantName = entity.getOutAgencyName();
+        }
         Map<String, Object> map = new HashMap<>();
         map.put("code", businessFormCode);
         map.put("date", DateUtils.toShowDate(createTime));
+        map.put("tenantName", tenantName);
         map.put("name", operatorName);
         map.put("countNum", countNum);
         map.put("totalAmount", totalAmount);
diff --git "a/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225.xls" "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225.xls"
new file mode 100644
index 0000000..728f90a
--- /dev/null
+++ "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225.xls"
Binary files differ
diff --git "a/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225.xlsx" "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225.xlsx"
deleted file mode 100644
index c42a48a..0000000
--- "a/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\205\245\345\272\223\345\215\225.xlsx"
+++ /dev/null
Binary files differ
diff --git "a/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\207\272\345\272\223\345\215\225.xls" "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\207\272\345\272\223\345\215\225.xls"
new file mode 100644
index 0000000..ac62447
--- /dev/null
+++ "b/deploy-jar-single/src/main/resources/import/\350\260\203\346\213\250\345\207\272\345\272\223\345\215\225.xls"
Binary files differ

--
Gitblit v1.9.1