修改导入

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -576,14 +576,14 @@ public class EquipmentDetailController extends AbstractBaseController {
 //        }
 
         // List<EquipmentDetailDownloadTemplateVO> equipmentDetailDownloadS = ExcelUtils.importExcel(file, 1, 1, EquipmentDetailDownloadTemplateVO.class);
-
+          Object date="";
         ExcelEnums excelEnums = ExcelEnums.getByKey(type);
         ExcelDto excelDto = new ExcelDto(excelEnums.getFileName(), excelEnums.getSheetName(), excelEnums.getClassUrl(), excelEnums.getType());
 
-        excelService.commonUpload(file, excelDto, getSelectedOrgInfo(), getUserInfo());
+        date= excelService.commonUpload(file, excelDto, getSelectedOrgInfo(), getUserInfo());
         EquipmentDetailController controllerProxy = SpringUtils.getBean(EquipmentDetailController.class);
         controllerProxy.refreshAllCount();
-        return ResponseHelper.buildResponse(null);
+        return ResponseHelper.buildResponse(date);
     }
 
     @Async

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IExcelService.java

@@ -18,5 +18,7 @@ public interface IExcelService {
      */
     List<EquipmentPoint> exportPointData(Map<String, Object> paramsMap);
 
-    void commonUpload(MultipartFile multipartFile, ExcelDto excelDto, ReginParams reginParams, AgencyUserModel agencyUserModel);
+    //void commonUpload(MultipartFile multipartFile, ExcelDto excelDto, ReginParams reginParams, AgencyUserModel agencyUserModel);
+    Object commonUpload(MultipartFile multipartFile, ExcelDto excelDto, ReginParams reginParams, AgencyUserModel agencyUserModel);
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IStockService.java

@@ -31,7 +31,8 @@ public interface IStockService extends IService<Stock> {
      * @return
      */
     List<EquipmentSpecific> uploadList(List<EquipmentDetailDownloadVO> equipmentDetailDownloadVOS, ReginParams reginParams, AgencyUserModel agencyUserModel);
-    List<EquipmentSpecific> uploadListByTemplate(List<EquipmentDetailDownloadTemplateDto> equipmentDetailDownloadVOS, ReginParams reginParams, AgencyUserModel agencyUserModel);
+    //List<EquipmentSpecific> uploadListByTemplate(List<EquipmentDetailDownloadTemplateDto> equipmentDetailDownloadVOS, ReginParams reginParams, AgencyUserModel agencyUserModel);
+    Object  uploadListByTemplate(List<EquipmentDetailDownloadTemplateDto> equipmentDetailDownloadVOS, ReginParams reginParams, AgencyUserModel agencyUserModel);
 
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ExcelServiceImpl.java

@@ -49,11 +49,12 @@ public class ExcelServiceImpl implements IExcelService {
     }
 
     @Override
-    public void commonUpload(MultipartFile multipartFile, ExcelDto excelDto, ReginParams reginParams, AgencyUserModel agencyUserModel) {
+    public Object commonUpload(MultipartFile multipartFile, ExcelDto excelDto, ReginParams reginParams, AgencyUserModel agencyUserModel) {
+        Object  date="";
         switch (excelDto.getType()) {
             case "XFZB":
                 try {
-                    excelImportFireEquipment(multipartFile, reginParams, agencyUserModel);
+                    date= excelImportFireEquipment(multipartFile, reginParams, agencyUserModel);
                 } catch (Exception e) {
                     throw new BadRequest(e.getMessage());
                 }
@@ -67,19 +68,21 @@ public class ExcelServiceImpl implements IExcelService {
                 }
                 break;
         }
-        return;
+        return  date;
     }
 
-    private void excelImportFireEquipment(MultipartFile multipartFile, ReginParams reginParams, AgencyUserModel agencyUserModel) throws Exception {
+    private Object excelImportFireEquipment(MultipartFile multipartFile, ReginParams reginParams, AgencyUserModel agencyUserModel) throws Exception {
 
+         Object date="";
         List<EquipmentDetailDownloadTemplateDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile,
                 EquipmentDetailDownloadTemplateDto.class, 1);
 
         if (excelDtoList != null && excelDtoList.size() > 0) {
-            iStockService.uploadListByTemplate(excelDtoList, reginParams, agencyUserModel);
+            date=iStockService.uploadListByTemplate(excelDtoList, reginParams, agencyUserModel);
         } else {
             throw new BadRequest("请填写数据后再上传！");
         }
+        return date;
     }
 
     private void excelImporVideo(MultipartFile multipartFile) throws Exception {