diff --git a/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java b/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java index 4b938514..650c64be 100644 --- a/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java +++ b/src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java @@ -71,6 +71,7 @@ public class RohsServiceImpl extends ServiceImpl impleme public PageUtils queryPage(Map params) { params.put("referenceNo", toLikeParam((String) params.get("referenceNo"))); params.put("applicant", toLikeParam((String) params.get("applicant"))); + params.put("currentApprover", toLikeParam((String) params.get("currentApprover"))); IPage page = this.baseMapper.queryPageWithNames( new Query().getPage(params), diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml index c6e8f412..8f75ecd4 100644 --- a/src/main/resources/mapper/part/PartInformationMapper.xml +++ b/src/main/resources/mapper/part/PartInformationMapper.xml @@ -2513,6 +2513,7 @@ update_by, plm_part_no, ifs_part_no, + --drawing_no, show_in_query_flag, temporary_part_flag, dbo.get_ifHas_peifang(site,part_no) as ifHasPeifang, diff --git a/src/main/resources/mapper/rohs/RohsMapper.xml b/src/main/resources/mapper/rohs/RohsMapper.xml index e8ce5d22..7cc9a2ee 100644 --- a/src/main/resources/mapper/rohs/RohsMapper.xml +++ b/src/main/resources/mapper/rohs/RohsMapper.xml @@ -110,6 +110,15 @@ and a.reference_no like #{params.referenceNo} + + and a.status = #{params.status} + + + and d.node_id = #{params.nodeId} + + + and dbo.get_plm_Approval_username(a.site, prh.workflow_id, d.node_id, a.reference_no) like #{params.currentApprover} + and a.applicant like #{params.applicant}