Browse Source

1127

master
ruanqi 2 years ago
parent
commit
6b188400f3
  1. 8
      src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java
  2. 2
      src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
  3. 6
      src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
  4. 3
      src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java
  5. 2
      src/main/resources/mapper/project/ProjectDao.xml
  6. 10
      src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

8
src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java

@ -1191,4 +1191,12 @@ public class TechnicalSpecificationController {
List<PlmProjectPartData> rows= technicalSpecificationService.getFinalPartData(data); List<PlmProjectPartData> rows= technicalSpecificationService.getFinalPartData(data);
return R.ok().put("rows",rows); 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);
}
} }

2
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); PlmTechnicalSpecificationSheetData getBMStatusDesc(@Param("site") String site, @Param("codeNo") String codeNo);
List<PlmProjectPartData> getFinalPartData(PlmProjectPartData data); List<PlmProjectPartData> getFinalPartData(PlmProjectPartData data);
// PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data);
} }

6
src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@ -1359,4 +1359,10 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
public List<PlmProjectPartData> getFinalPartData(PlmProjectPartData data){ public List<PlmProjectPartData> getFinalPartData(PlmProjectPartData data){
return technicalSpecificationMapper.getFinalPartData(data); return technicalSpecificationMapper.getFinalPartData(data);
} }
@Override
public PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data){
// return technicalSpecificationMapper.getOADetailForBM(data);
return null;
}
} }

3
src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java

@ -967,4 +967,7 @@ public interface TechnicalSpecificationService {
String getBMStatusDesc(PlmTechnicalSpecificationSheetData data); String getBMStatusDesc(PlmTechnicalSpecificationSheetData data);
List<PlmProjectPartData> getFinalPartData(PlmProjectPartData data); List<PlmProjectPartData> getFinalPartData(PlmProjectPartData data);
PlmTechnicalSpecificationSheetData getOADetailForBM(PlmTechnicalSpecificationSheetData data);
} }

2
src/main/resources/mapper/project/ProjectDao.xml

@ -105,7 +105,9 @@
from sys_user a from sys_user a
left join AccessSite b on a.username = b.UserID 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 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
<where> <where>
and e.role_no='R001'
<if test="site != null and site != ''"> <if test="site != null and site != ''">
and b.site = #{site} and b.site = #{site}
</if> </if>

10
src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@ -1078,4 +1078,14 @@ step_id,reject_flag,reject_step_id,mpOperator,pod
and a.RealFlag='Y' and a.RealFlag='Y'
</where> </where>
</select> </select>
<!-- <select id="getOADetailForBM" resultType="PlmTechnicalSpecificationSheetData">-->
<!-- d.is_reject,-->
<!-- d.node_id,-->
<!-- d.node_name,-->
<!-- d.create_by as createBy2-->
<!-- left join plm_request_header as prh on a.site = prh.site and prh.menu_id = #{query.menuId}-->
<!-- left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id-->
<!-- </select>-->
</mapper> </mapper>
Loading…
Cancel
Save