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 3e4f144fe..245256a46 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 @@ -18,7 +18,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; -import java.util.Map; /** * @Description: 项目库-相关人员维护表 @@ -41,11 +40,10 @@ public class ProjectRelatedPersonnelController extends JeroController queryPageList(@RequestBody Map params) { - List pageList= projectRelatedPersonnelService.queryPageList(params); - return Result.OK(params.get("cut").toString(),pageList); + public Result queryPageList(@RequestParam(name="projectId",required=true) String projectId,@RequestParam(name="cut",required=true) String cut) { + List pageList= projectRelatedPersonnelService.queryPageList(projectId); + return Result.OK(cut,pageList); } - /** * 列表查询 * @@ -138,10 +136,11 @@ public class ProjectRelatedPersonnelController extends JeroController params) { - + public ModelAndView exportXls(HttpServletRequest request,@RequestParam(name="id") String id, + @RequestParam(name="projectId") String projectId, + @RequestParam(name="cut",required=true) String cut) { //获取导出的数据 - List records = projectRelatedPersonnelService.disposeExportXls(params); + List records = projectRelatedPersonnelService.disposeExportXls(id,projectId); return projectRelatedPersonnelService.exportDataToXls(request, records, ProjectRelatedPersonnel.class, "相关人员名单"); } @@ -152,9 +151,8 @@ public class ProjectRelatedPersonnelController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { - return projectRelatedPersonnelService.importExcel(request, response, ProjectRelatedPersonnel.class); + public Result importExcel(HttpServletRequest request, HttpServletResponse response,@RequestParam(name="projectId",required=true) String projectId) { + return projectRelatedPersonnelService.importExcel(request, response, ProjectRelatedPersonnel.class,projectId); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java index e0535b4e8..2d384809c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRelatedPersonnelMapper.java @@ -2,9 +2,9 @@ package com.jero.modules.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.modules.project.entity.ProjectRelatedPersonnel; +import org.springframework.data.repository.query.Param; import java.util.List; -import java.util.Map; /** * @Description: 相关人员维护表 @@ -14,7 +14,7 @@ import java.util.Map; */ public interface ProjectRelatedPersonnelMapper extends BaseMapper { - List queryPageList(Map params); + List queryPageList(@Param("projectId") String projectId); - List queryById(String id); + List queryById(@Param("id")String id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml index 5289c00c9..e370f3c7e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml @@ -29,14 +29,15 @@ prp.update_time, prp.sys_org_code +