留样检验新增批次号查询

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;
-    }
 }

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml

@@ -66,6 +66,9 @@
             <if test="intervalDate != null and intervalDate != ''">
                 and FORMAT ( task.sample_time, 'yyyy-MM' ) = #{intervalDate}
             </if>
+            <if test="incomeBatchNo != null and incomeBatchNo != ''">
+                and task.income_batch_no like concat('%', #{incomeBatchNo}, '%')
+            </if>
         </where>
         order by task.sample_time desc,task.create_time desc
     </select>
@@ -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 @@
             <if test="workOrderCodeSap != null and workOrderCodeSap != ''">
                and t.work_order_code_sap like concat('%', #{workOrderCodeSap}, '%')
             </if>
+            <if test="incomeBatchNo != null and incomeBatchNo != ''">
+               and t.income_batch_no like concat('%', #{incomeBatchNo}, '%')
+            </if>
+            <if test="materialName != null and materialName != ''">
+               and t.material_name like concat('%', #{materialName}, '%')
+            </if>
 
         </where>
         GROUP BY t.id, t.material_name, t.income_batch_no, t.work_order_code_sap, t.sample_time
         <if test="searchFlag == 1 ">
-            HAVING SUM(t.check_times) <![CDATA[ < ]]> 1
+            HAVING SUM(( CASE WHEN t.qualified != 'X' THEN 1 ELSE 0 END )) <![CDATA[ < ]]> 1
         </if>
         <if test="searchFlag == 2 ">
-            HAVING SUM(t.check_times) <![CDATA[ < ]]> 3
+            HAVING SUM(( CASE WHEN t.qualified != 'X' THEN 1 ELSE 0 END )) <![CDATA[ < ]]> 3
         </if>
         <if test="searchFlag == 3 ">
-            HAVING SUM(t.check_times) <![CDATA[ < ]]> 6
+            HAVING SUM(( CASE WHEN t.qualified != 'X' THEN 1 ELSE 0 END )) <![CDATA[ < ]]> 6
         </if>
         <if test="searchFlag == 6 ">
-            HAVING SUM(t.check_times) <![CDATA[ < ]]> 12
+            HAVING SUM(( CASE WHEN t.qualified != 'X' THEN 1 ELSE 0 END )) <![CDATA[ < ]]> 12
         </if>
         <if test="searchFlag == 12 ">
-            HAVING SUM(t.check_times) <![CDATA[ < ]]> 24
+            HAVING SUM(( CASE WHEN t.qualified != 'X' THEN 1 ELSE 0 END )) <![CDATA[ < ]]> 24
         </if>
         ORDER BY t.sample_time desc
     </select>