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 07f1bd18..b47959de 100644 --- a/src/main/java/com/spring/modules/project/controller/ProjectController.java +++ b/src/main/java/com/spring/modules/project/controller/ProjectController.java @@ -64,8 +64,9 @@ public class ProjectController { public R searchProjectInfoList(String site, String projectId, String projectName, - String customerId){ - List rows = projectService.projectInfoListSearch(site,projectId,projectName,customerId); + String customerId, + String testPartNo){ + List rows = projectService.projectInfoListSearch(site,projectId,projectName,customerId, testPartNo); return R.ok().put("rows",rows); } 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 3deb3416..169f6844 100644 --- a/src/main/java/com/spring/modules/project/dao/ProjectDao.java +++ b/src/main/java/com/spring/modules/project/dao/ProjectDao.java @@ -40,7 +40,8 @@ public interface ProjectDao extends BaseMapper { List selectProjectInfoList( @Param("site")String site, @Param("projectId")String projectId, @Param("projectName")String projectName, - @Param("customerId")String customerId); + @Param("customerId")String customerId, + @Param("testPartNo")String testPartNo); PlmProjectInfoData checkPlmProjectInfoData(PlmProjectInfoData inData); /** 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 7d8ec550..168f4873 100644 --- a/src/main/java/com/spring/modules/project/service/ProjectService.java +++ b/src/main/java/com/spring/modules/project/service/ProjectService.java @@ -36,7 +36,8 @@ public interface ProjectService { List projectInfoListSearch(String site, String projectId, String projectName, - String customerId); + String customerId, + String testPartNo); /** * @Description TODO 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 86fd5f86..39a8aa4b 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 @@ -119,7 +119,8 @@ public class ProjectServiceImpl implements ProjectService { public List projectInfoListSearch(String site, String projectId, String projectName, - String customerId){ + String customerId, + String testPartNo){ // SysUserEntity user = (SysUserEntity)SecurityUtils.getSubject().getPrincipal(); // List list = sysRoleService.findRoleIdByUsername(user.getUsername(),1); @@ -128,7 +129,7 @@ public class ProjectServiceImpl implements ProjectService { // if (!list.isEmpty()){ // // } - return projectDao.selectProjectInfoList(site,projectId,projectName,customerId); + return projectDao.selectProjectInfoList(site,projectId,projectName,customerId,testPartNo); } @Override diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml index e93a570f..98965126 100644 --- a/src/main/resources/mapper/project/ProjectDao.xml +++ b/src/main/resources/mapper/project/ProjectDao.xml @@ -4,52 +4,58 @@