2026-05-18

RoHs优化

src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java

@@ -71,6 +71,7 @@ public class RohsServiceImpl extends ServiceImpl<RohsMapper, RohsEntity> impleme
     public PageUtils queryPage(Map<String, Object> 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<RohsEntity> page = this.baseMapper.queryPageWithNames(
                 new Query<RohsEntity>().getPage(params),

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,

src/main/resources/mapper/rohs/RohsMapper.xml

@@ -110,6 +110,15 @@
         <if test="params.referenceNo != null and params.referenceNo != ''">
             and a.reference_no like #{params.referenceNo}
         </if>
+        <if test="params.status != null and params.status != ''">
+            and a.status = #{params.status}
+        </if>
+        <if test="params.nodeId != null and params.nodeId != ''">
+            and d.node_id = #{params.nodeId}
+        </if>
+        <if test="params.currentApprover != null and params.currentApprover != ''">
+            and dbo.get_plm_Approval_username(a.site, prh.workflow_id, d.node_id, a.reference_no) like #{params.currentApprover}
+        </if>
         <if test="params.applicant != null and params.applicant != ''">
             and a.applicant like #{params.applicant}
         </if>