项目库相关人员列表+导出修改

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<ProjectRelat
 
 	/**处理导出数据*/
 	@Override
-	public List<ProjectRelatedPersonnel> disposeExportXls(Map<String, Object> params){
+	public List<ProjectRelatedPersonnel> disposeExportXls(String id,String projectId){
-		List<ProjectRelatedPersonnel> records=queryPageList(params);
+		List<ProjectRelatedPersonnel> records=null;
-		//id有值,按id过滤
+
-		if(!params.get("id").toString().isEmpty()){//多个id
+		if(StringUtils.isNotBlank(id)) {//多个id
-			List<String> idList = Arrays.asList(params.get("id").toString().split(","));
+
-			records.stream().filter(e -> idList.equals(e.getId())).collect(Collectors.<ProjectRelatedPersonnel>toList());//.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
+			//id有值,按id查
+			if (id.contains(",")) {//多个id
+				List<String> 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<ProjectRelat
 	 * @param request
 	 */@Override
 	public ModelAndView exportDataToXls(HttpServletRequest request, List<ProjectRelatedPersonnel> dataList, Class<ProjectRelatedPersonnel> clazz, String title) {
-		//Result<ProjectRelatedPersonnel> result = new Result<ProjectRelatedPersonnel>();
 	 	// Step.1 组装查询条件
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
@@ -363,8 +372,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		ExportParams exportParams=new ExportParams(title , "导出人:" + sysUser.getUsername(), title);
 		mv.addObject(NormalExcelConstants.PARAMS,exportParams);
 		mv.addObject(NormalExcelConstants.DATA_LIST, dataList);
-		return mv;}catch(Exception e){
+		return mv;
-			throw new JeroBootException("Attribute already exists, please check!");
+	}catch(Exception e){
+			throw new JeroBootException("出现异常,请重新登录");
 		}
 
 	}
@@ -372,20 +382,36 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 	/**
 	 * 导出excel模板
 	 *
-	 * @param request
 	 */
 	@Override
-	public ModelAndView exportTemplate(HttpServletRequest request, Class<ProjectRelatedPersonnel> clazz, String title) {
+	public ModelAndView setExporTemplate(HttpServletRequest request, Class<ProjectRelatedPersonnel> clazz, String title){
+		List<ProjectRelatedPersonnel> 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无效 ,前端会重更新设置一下
+		try {
-		mv.addObject(NormalExcelConstants.CLASS, clazz);
+
-		ExportParams  exportParams=new ExportParams(title , "导出人:" + sysUser.getUsername(), title);
+
-		mv.addObject(NormalExcelConstants.PARAMS,exportParams);
+			mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下
-		return mv;
+			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<ProjectRelat
 	 * @param request
 	 */
 	@Override
-	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, Class<ProjectRelatedPersonnel> clazz) {
+	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, Class<ProjectRelatedPersonnel> clazz,String projectId) {
 		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
 		Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
 		for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -405,7 +431,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			params.setNeedSave(true);
 			try {
 				List<ProjectRelatedPersonnel> list = ExcelImportUtil.importExcel(file.getInputStream(), clazz, params);
-
+				for(ProjectRelatedPersonnel projectRelatedPersonnel:list){
+					projectRelatedPersonnel.setProjectId(projectId);
+				}
 				saveBatch(list);
 				return Result.OK("文件导入成功！数据行数：" + list.size());
 			} catch (Exception e) {