From af6d365b952a54dc07eb5773284d928b5caf37f7 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 22 Apr 2022 09:15:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8+=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelServiceImpl.java | 64 +++++++++++++------ 1 file changed, 46 insertions(+), 18 deletions(-) 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 e8d24031f..db8f47a43 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 @@ -333,12 +333,22 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl disposeExportXls(Map params){ - List records=queryPageList(params); - //id有值,按id过滤 - if(!params.get("id").toString().isEmpty()){//多个id - List idList = Arrays.asList(params.get("id").toString().split(",")); - records.stream().filter(e -> idList.equals(e.getId())).collect(Collectors.toList());//.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); + public List disposeExportXls(String id,String projectId){ + List records=null; + + if(StringUtils.isNotBlank(id)) {//多个id + + //id有值,按id查 + if (id.contains(",")) {//多个id + List idList = Arrays.asList(id.split(",")); + for (String midId : idList) { + records = queryById(midId); + } + } else {//1个id + records = queryById(id); + } + }else{ + records=queryPageList(projectId); } //id无值,传全部 return records; @@ -349,7 +359,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl dataList, Class clazz, String title) { - //Result result = new Result(); // Step.1 组装查询条件 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -363,8 +372,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl clazz, String title) { + public ModelAndView setExporTemplate(HttpServletRequest request, Class clazz, String title){ + List records=null; + + ProjectRelatedPersonnel projectRelatedPersonnel=new ProjectRelatedPersonnel(); + projectRelatedPersonnel.setDutyTerritory("安全领域"); + projectRelatedPersonnel.setLawEngineerName("ning.chen xinhui.wei"); + projectRelatedPersonnel.setEngineeringInterfacePersonName("ning.chen xinhui.wei"); + projectRelatedPersonnel.setCertificationEngineerName("ning.chen xinhui.wei"); + projectRelatedPersonnel.setRemark("xxxxx"); + records.add(projectRelatedPersonnel); // Step.1 组装查询条件 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // Step.2 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下 - mv.addObject(NormalExcelConstants.CLASS, clazz); - ExportParams exportParams=new ExportParams(title , "导出人:" + sysUser.getUsername(), title); - mv.addObject(NormalExcelConstants.PARAMS,exportParams); - return mv; + try { + + + mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.CLASS, clazz); + ExportParams exportParams=new ExportParams(title , "导出人:" + sysUser.getUsername(), title); + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, projectRelatedPersonnel); + mv.addObject(NormalExcelConstants.DATA_LIST, records); + return mv; + }catch(Exception e){ + throw new JeroBootException("出现异常,请重新登录"); + } } /** @@ -394,7 +420,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl importExcel(HttpServletRequest request, HttpServletResponse response, Class clazz) { + public Result importExcel(HttpServletRequest request, HttpServletResponse response, Class clazz,String projectId) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; Map fileMap = multipartRequest.getFileMap(); for (Map.Entry entity : fileMap.entrySet()) { @@ -405,7 +431,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl list = ExcelImportUtil.importExcel(file.getInputStream(), clazz, params); - + for(ProjectRelatedPersonnel projectRelatedPersonnel:list){ + projectRelatedPersonnel.setProjectId(projectId); + } saveBatch(list); return Result.OK("文件导入成功！数据行数：" + list.size()); } catch (Exception e) {