From 52e68ac7f671257b10d626dc90d3e2562a298a62 Mon Sep 17 00:00:00 2001
From: FCD <2453864257@qq.com>
Date: Sat, 7 Feb 2026 10:52:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=99=E6=A0=B7=E6=A3=80=E9=AA=8C=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E6=89=B9=E6=AC=A1=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../domain/query/QcCheckSampleTaskQuery.java | 86 ++-----------------
.../quality/QcCheckSampleTaskMapper.xml | 22 +++--
2 files changed, 23 insertions(+), 85 deletions(-)
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/query/QcCheckSampleTaskQuery.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/query/QcCheckSampleTaskQuery.java
index e60b9ce4a..0ae2d7f67 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/query/QcCheckSampleTaskQuery.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/query/QcCheckSampleTaskQuery.java
@@ -1,5 +1,7 @@
package com.op.quality.domain.query;
+import lombok.Data;
+
/**
*
* 留样检验查询实体类
@@ -7,6 +9,7 @@ package com.op.quality.domain.query;
* @author 019117
* @date 2025/3/25 10:50
*/
+@Data
public class QcCheckSampleTaskQuery {
/** 时间查询条件 **/
@@ -34,84 +37,9 @@ public class QcCheckSampleTaskQuery {
private String intervalDate;
+ /**
+ * 批次号
+ * **/
+ private String incomeBatchNo;
- public String getQueryDate() {
- return queryDate;
- }
-
- public void setQueryDate(String queryDate) {
- this.queryDate = queryDate;
- }
-
- public String getStartSampleDate() {
- return startSampleDate;
- }
-
- public void setStartSampleDate(String startSampleDate) {
- this.startSampleDate = startSampleDate;
- }
-
- public String getEndSampleDate() {
- return endSampleDate;
- }
-
- public void setEndSampleDate(String endSampleDate) {
- this.endSampleDate = endSampleDate;
- }
-
- public String getMaterialName() {
- return materialName;
- }
-
- public void setMaterialName(String materialName) {
- this.materialName = materialName;
- }
-
- public String getWorkOrderCodeSap() {
- return workOrderCodeSap;
- }
-
- public void setWorkOrderCodeSap(String workOrderCodeSap) {
- this.workOrderCodeSap = workOrderCodeSap;
- }
-
- public String getFirstDate() {
- return firstDate;
- }
-
- public void setFirstDate(String firstDate) {
- this.firstDate = firstDate;
- }
-
- public String getSecondDate() {
- return secondDate;
- }
-
- public void setSecondDate(String secondDate) {
- this.secondDate = secondDate;
- }
-
- public String getThirdDate() {
- return thirdDate;
- }
-
- public void setThirdDate(String thirdDate) {
- this.thirdDate = thirdDate;
- }
-
- public String getSearchFlag() {
- return searchFlag;
- }
-
- public void setSearchFlag(String searchFlag) {
- this.searchFlag = searchFlag;
- }
-
- public String getIntervalDate() {
- return intervalDate;
- }
-
- public void setIntervalDate(String intervalDate) {
- this.intervalDate = intervalDate;
- }
}
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml
index e0d4a5a16..9997a9d5a 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml
@@ -66,6 +66,9 @@
and FORMAT ( task.sample_time, 'yyyy-MM' ) = #{intervalDate}
+
+ and task.income_batch_no like concat('%', #{incomeBatchNo}, '%')
+
order by task.sample_time desc,task.create_time desc
@@ -123,7 +126,8 @@
t.work_order_code_sap ,
FORMAT ( t.sample_time, 'yyyy-MM' ) AS sample_date,
t.sample_time,
- COALESCE ( r.check_times, 0 ) check_times
+ COALESCE ( r.check_times, 0 ) check_times,
+ r.qualified
FROM qc_check_sample_task t
LEFT JOIN qc_check_sample_result r ON t.id = r.sample_task_id
) t
@@ -148,23 +152,29 @@
and t.work_order_code_sap like concat('%', #{workOrderCodeSap}, '%')
+
+ and t.income_batch_no like concat('%', #{incomeBatchNo}, '%')
+
+
+ and t.material_name like concat('%', #{materialName}, '%')
+
GROUP BY t.id, t.material_name, t.income_batch_no, t.work_order_code_sap, t.sample_time
- HAVING SUM(t.check_times) 1
+ HAVING SUM(( CASE WHEN t.qualified != 'X' THEN 1 ELSE 0 END )) 1
- HAVING SUM(t.check_times) 3
+ HAVING SUM(( CASE WHEN t.qualified != 'X' THEN 1 ELSE 0 END )) 3
- HAVING SUM(t.check_times) 6
+ HAVING SUM(( CASE WHEN t.qualified != 'X' THEN 1 ELSE 0 END )) 6
- HAVING SUM(t.check_times) 12
+ HAVING SUM(( CASE WHEN t.qualified != 'X' THEN 1 ELSE 0 END )) 12
- HAVING SUM(t.check_times) 24
+ HAVING SUM(( CASE WHEN t.qualified != 'X' THEN 1 ELSE 0 END )) 24
ORDER BY t.sample_time desc