2025-10-09

优化过程检验查询条件

src/main/java/com/gaotao/modules/pms/controller/QcController.java

@@ -1673,7 +1673,8 @@ public class QcController {
         String site = params.get("site");
         //String buNo = params.get("buNo");
         String orderNo = params.get("orderNo");
-        int count = qcService.checkProcessInspectionPendingCount(site, orderNo);
+        String resourceId = params.get("resourceId");
+        int count = qcService.checkProcessInspectionPendingCount(site, orderNo, resourceId);
         return R.ok().put("count", count);
     }
 

src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java

@@ -466,5 +466,5 @@ public interface QcMapper {
     /**
      * 查询过程检验待检验记录数量
      */
-    int checkProcessInspectionPendingCount(@Param("site") String site, @Param("orderNo") String orderNo);
+    int checkProcessInspectionPendingCount(@Param("site") String site, @Param("orderNo") String orderNo, @Param("resourceId") String resourceId);
 }

src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java

@@ -3519,8 +3519,8 @@ public class QcServiceImpl implements QcService {
      * 查询过程检验待检验记录数量
      */
     @Override
-    public int checkProcessInspectionPendingCount(String site, String orderNo) {
-        return qcMapper.checkProcessInspectionPendingCount(site, orderNo);
+    public int checkProcessInspectionPendingCount(String site, String orderNo, String resourceId) {
+        return qcMapper.checkProcessInspectionPendingCount(site, orderNo, resourceId);
     }
 
 }

src/main/java/com/gaotao/modules/pms/service/QcService.java

@@ -264,5 +264,5 @@ public interface QcService {
     /**
      * 查询过程检验待检验记录数量
      */
-    int checkProcessInspectionPendingCount(String site, String orderNo);
+    int checkProcessInspectionPendingCount(String site, String orderNo, String resourceId);
 }

src/main/resources/mapper/pms/QcMapper.xml

@@ -611,6 +611,9 @@
             <if test = "query.operationDesc != null and query.operationDesc != ''">
                 AND a.operation_desc LIKE '%' + #{query.operationDesc} + '%'
             </if>
+            <if test = "query.resourceId != null and query.resourceId != ''">
+                AND a.resource_id = #{query.resourceId}
+            </if>
             <if test="query.startDate != null">
                 AND a.inspector_date >= #{query.startDate}
             </if>
@@ -3321,6 +3324,7 @@
         FROM qc_ipqc_record 
         WHERE site = #{site}
         AND order_no = #{orderNo} 
+        AND resource_id = #{resourceId}
         AND state IN ('未开始', '待检验')
     </select>
 </mapper>