diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index b01a8aebc..b85d34da2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -166,11 +166,10 @@ public class ProjectRelatedPersonnelController extends JeroController importExcel(MultipartFile file, + public void importExcel(MultipartFile file, @RequestParam(name="projectId",required=true) String projectId, @RequestParam(name="cut",required=true) String cut) throws IOException, InvalidFormatException { - String message = projectRelatedPersonnelService.importExcel(file, ProjectRelatedPersonnel.class, projectId, cut); - return Result.OK(message); + projectRelatedPersonnelService.importExcel(file, ProjectRelatedPersonnel.class, projectId, cut); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index b1961c559..7455c6f05 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -80,10 +80,10 @@ public interface IProjectRelatedPersonnelService extends IService clazz, String projectId, String cut) throws IOException, InvalidFormatException; + void importExcel(MultipartFile file, Class clazz, String projectId, String cut) throws IOException, InvalidFormatException; - String oppositeDisposeData(List records, String projectId, String cut); + void oppositeDisposeData(List records, String projectId, String cut); ProjectRelatedPersonnel queryByProjectIdAndDutyTerritory(String projectId, String dutyTerritory); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 32169ac6d..27dc08239 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -648,12 +648,11 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl clazz, String projectId, String cut) throws IOException, InvalidFormatException { - String message = ""; + public void importExcel(MultipartFile file, + Class clazz, String projectId, String cut) throws IOException, InvalidFormatException { + String explainInfo= null; String titleOne = ""; @@ -706,41 +705,38 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl 1) {//读取数据 //获取每一行数据 @@ -753,11 +749,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl records, String projectId, String cut) { + public void oppositeDisposeData(List records, String projectId, String cut) { int row=3; StringBuilder message = new StringBuilder(); for (ProjectRelatedPersonnel projectRelatedPersonnel:records) { @@ -974,7 +967,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl