diff --git a/src/main/java/com/spring/modules/project/controller/ProjectController.java b/src/main/java/com/spring/modules/project/controller/ProjectController.java index b03838da..7b5af349 100644 --- a/src/main/java/com/spring/modules/project/controller/ProjectController.java +++ b/src/main/java/com/spring/modules/project/controller/ProjectController.java @@ -57,13 +57,10 @@ public class ProjectController { return R.ok().put("rows",rows); } - @GetMapping("/getProjectPartList") + @PostMapping("/getProjectPartList") @ResponseBody - public R getProjectPartList(@RequestParam("site") String site, - String testPartNo, - String partDesc, - String projectId){ - List rows = projectService.getProjectPartList(site,testPartNo,partDesc,projectId); + public R getProjectPartList(@RequestBody PlmProjectPartData data){ + List rows = projectService.getProjectPartList(data); return R.ok().put("rows", rows); } @GetMapping("/getProjectPart") diff --git a/src/main/java/com/spring/modules/project/dao/ProjectDao.java b/src/main/java/com/spring/modules/project/dao/ProjectDao.java index ec69c461..8663ec33 100644 --- a/src/main/java/com/spring/modules/project/dao/ProjectDao.java +++ b/src/main/java/com/spring/modules/project/dao/ProjectDao.java @@ -213,10 +213,7 @@ public interface ProjectDao extends BaseMapper { */ PlmUserRoleData getProjectUserRole(PlmUserRoleData data); - List getProjectPartList(@Param("site") String site, - @Param("testPartNo") String testPartNo, - @Param("partDesc") String partDesc, - @Param("projectId") String projectId); + List getProjectPartList(PlmProjectPartData data); List getProjectPart(@Param("site") String site, @Param("testPartNo") String testPartNo); diff --git a/src/main/java/com/spring/modules/project/service/ProjectService.java b/src/main/java/com/spring/modules/project/service/ProjectService.java index 280c2950..0c7719dd 100644 --- a/src/main/java/com/spring/modules/project/service/ProjectService.java +++ b/src/main/java/com/spring/modules/project/service/ProjectService.java @@ -191,7 +191,7 @@ public interface ProjectService { PlmUserRoleData getProjectUserRole(PlmUserRoleData data); - List getProjectPartList(String site,String testPartNo,String partDesc,String projectId); + List getProjectPartList(PlmProjectPartData data); List getProjectPartList(String site,String testPartNo); List getPlmProjectContactString2(PlmProjectInfoData data); diff --git a/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java b/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java index 7a4f74a4..5d5fc61a 100644 --- a/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java +++ b/src/main/java/com/spring/modules/project/service/impl/ProjectServiceImpl.java @@ -296,8 +296,8 @@ public class ProjectServiceImpl implements ProjectService { } @Override - public List getProjectPartList(String site,String testPartNo,String partDesc,String projectId) { - return projectDao.getProjectPartList(site,testPartNo,partDesc,projectId); + public List getProjectPartList(PlmProjectPartData data) { + return projectDao.getProjectPartList(data); } @Override public List getProjectPartList(String site,String testPartNo) { diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml index cc38934e..5bae8f90 100644 --- a/src/main/resources/mapper/project/ProjectDao.xml +++ b/src/main/resources/mapper/project/ProjectDao.xml @@ -436,14 +436,20 @@ left join plm_project_info ppi on vpp.site = ppi.site and vpp.project_id = ppi.project_id left join plm_customer_part_info pcpi on vpp.site = pcpi.site and ppi.customer_id = pcpi.customer_no and vpp.test_part_no = pcpi.part_no where vpp.site = #{site} + + and vpp.project_id = #{projectId} + and vpp.test_part_no like #{testPartNo} and vpp.part_desc like #{partDesc} - - and vpp.project_id = #{projectId} + + and vpp.final_part_no like #{finalPartNo} + + + and pcpi.customer_part_no like #{customerPartNo}