2026-07-22

RoHS优化

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

@@ -86,6 +86,7 @@ public class RohsServiceImpl extends ServiceImpl<RohsMapper, RohsEntity> impleme
         params.put("currentApprover", trimToNull((String) params.get("currentApprover")));
         params.put("ifsPartNo", trimToNull((String) params.get("ifsPartNo")));
         params.put("materialDesc", trimToNull((String) params.get("materialDesc")));
+        params.put("isExpiring", trimToNull((String) params.get("isExpiring")));
 
         long currPage = parseLong(params.get(Constant.PAGE), 1L);
         long pageSize = parseLong(params.get(Constant.LIMIT), 10L);

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

@@ -157,6 +157,9 @@
         <if test="params.rohsStatus != null and params.rohsStatus != ''">
             and a.rohs_status = #{params.rohsStatus}
         </if>
+        <if test="params.isExpiring != null and params.isExpiring != ''">
+            and isnull(a.is_expiring, 'N') = #{params.isExpiring}
+        </if>
         <if test="params.nodeId != null and params.nodeId != ''">
             and d.node_id = #{params.nodeId}
         </if>
@@ -213,6 +216,9 @@
         <if test="params.rohsStatus != null and params.rohsStatus != ''">
             and a.rohs_status = #{params.rohsStatus}
         </if>
+        <if test="params.isExpiring != null and params.isExpiring != ''">
+            and isnull(a.is_expiring, 'N') = #{params.isExpiring}
+        </if>
         <if test="params.nodeId != null and params.nodeId != ''">
             and d.node_id = #{params.nodeId}
         </if>
@@ -285,6 +291,9 @@
         <if test="params.rohsStatus != null and params.rohsStatus != ''">
             and a.rohs_status = #{params.rohsStatus}
         </if>
+        <if test="params.isExpiring != null and params.isExpiring != ''">
+            and isnull(a.is_expiring, 'N') = #{params.isExpiring}
+        </if>
         <if test="params.nodeId != null and params.nodeId != ''">
             and d.node_id = #{params.nodeId}
         </if>