diff --git a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java index eda9ab9c..28922a67 100644 --- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java +++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java @@ -1191,4 +1191,12 @@ public class TechnicalSpecificationController { List rows= technicalSpecificationService.getFinalPartData(data); return R.ok().put("rows",rows); } + + + @PostMapping(value="/getOADetailForBM") + @ResponseBody + public R getOADetailForBM(@RequestBody PlmTechnicalSpecificationSheetData data){ + PlmTechnicalSpecificationSheetData result= technicalSpecificationService.getOADetailForBM(data); + return R.ok().put("row",result); + } } diff --git a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java index 81164536..d5fcb18e 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -1149,4 +1149,6 @@ public interface TechnicalSpecificationMapper { PlmTechnicalSpecificationSheetData getBMStatusDesc(@Param("site") String site, @Param("codeNo") String codeNo); List getFinalPartData(PlmProjectPartData data); + + // PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data); } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index 46ef5e09..d789d228 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -1359,4 +1359,10 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification public List getFinalPartData(PlmProjectPartData data){ return technicalSpecificationMapper.getFinalPartData(data); } + + @Override + public PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data){ + // return technicalSpecificationMapper.getOADetailForBM(data); + return null; + } } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java index 7b40bbe2..ee84a2ba 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java @@ -967,4 +967,7 @@ public interface TechnicalSpecificationService { String getBMStatusDesc(PlmTechnicalSpecificationSheetData data); List getFinalPartData(PlmProjectPartData data); + + + PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data); } diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml index eebccfb7..a8cc41a5 100644 --- a/src/main/resources/mapper/project/ProjectDao.xml +++ b/src/main/resources/mapper/project/ProjectDao.xml @@ -105,7 +105,9 @@ from sys_user a left join AccessSite b on a.username = b.UserID left join AccessProject c on a.username = c.username and c.project_id = #{projectId} and c.site = b.site + left join AccessRole e on a.username=e.username + and e.role_no='R001' and b.site = #{site} diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 538f15fa..c036acb5 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -1078,4 +1078,14 @@ step_id,reject_flag,reject_step_id,mpOperator,pod and a.RealFlag='Y' + + + + + + + + + + \ No newline at end of file