diff --git a/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java b/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java index 2e08e67..6565af7 100644 --- a/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java +++ b/src/main/java/com/kiisoo/ic/store/controller/StoreEmployeeController.java @@ -1,6 +1,7 @@ package com.kiisoo.ic.store.controller; import com.kiisoo.ic.common.BaseController; +import com.kiisoo.ic.employee.entity.ImportErrorDTO; import com.kiisoo.ic.store.service.StoreEmployeeService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import java.util.List; import java.util.Map; /** @@ -52,8 +54,8 @@ public class StoreEmployeeController extends BaseController { @ResponseBody public Map importShopEmpByExcel(@RequestParam("file") MultipartFile file) { try { - storeEmployeeService.importShopEmpByExcel(file); - return data(null); + List importErrorDTOS = storeEmployeeService.importShopEmpByExcel(file); + return data(importErrorDTOS); } catch (Exception e) { log.error("添加用户失败", e); return fail(); diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java index edc73d4..2005625 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -25,6 +25,7 @@ import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -47,16 +48,22 @@ import static com.kiisoo.ic.store.constant.Constants.*; @Service public class StoreEmployeeService { + @Autowired private PoiStoreDOMapper poiStoreDOMapper; + @Autowired private PrivilageCpUserStoreDOMapper privilageCpUserStoreDOMapper; + @Autowired private PrivilageCpUserDOMapper privilageCpUserDOMapper; + @Autowired private PoiStoreStaffDOMapper poiStoreStaffDOMapper; + @Autowired private PrivilageDepartmentDOMapper departmentDOMapper; + @Autowired private EmployeeService employeeService; /**