From 9b391e533111782b30f1c94a78694505814183ca Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Wed, 3 Jun 2026 13:36:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(npcIqc):=20=E6=B7=BB=E5=8A=A0CA=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E6=96=87=E6=9C=AC=E6=98=BE=E7=A4=BA=E5=92=8C=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增caRequestText字段用于显示CA请求的文本描述
- 添加dateReceivedStart和dateReceivedEnd字段支持收货日期范围查询
- 在查询结果中增加part_desc作为item_name显示
- 实现CA请求状态的文本转换逻辑（1为是，0为否）
- 添加issueNo模糊查询功能
- 添加收货日期范围过滤查询功能
---
 .../com/xujie/modules/npcIqc/entity/NpcIqc.java   | 11 +++++++++++
 src/main/resources/mapper/npcIqc/NpcIqcMapper.xml | 15 +++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/main/java/com/xujie/modules/npcIqc/entity/NpcIqc.java b/src/main/java/com/xujie/modules/npcIqc/entity/NpcIqc.java
index ad7afe0..682a8bf 100644
--- a/src/main/java/com/xujie/modules/npcIqc/entity/NpcIqc.java
+++ b/src/main/java/com/xujie/modules/npcIqc/entity/NpcIqc.java
@@ -63,6 +63,10 @@ public class NpcIqc extends QueryPage {
 
     private Boolean caRequest;
 
+    // 用于显示的非持久化字段
+    @TableField(exist = false)
+    private String caRequestText;
+
     private BigDecimal reworkHours;
 
     private BigDecimal reworkRate;
@@ -77,6 +81,13 @@ public class NpcIqc extends QueryPage {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date entryDate;
 
+    // 查询条件：收货日期范围
+    @TableField(exist = false)
+    private String dateReceivedStart;
+
+    @TableField(exist = false)
+    private String dateReceivedEnd;
+
     private String issueNo;
 
     private String updateBy;
diff --git a/src/main/resources/mapper/npcIqc/NpcIqcMapper.xml b/src/main/resources/mapper/npcIqc/NpcIqcMapper.xml
index 9aa4708..c30a9d9 100644
--- a/src/main/resources/mapper/npcIqc/NpcIqcMapper.xml
+++ b/src/main/resources/mapper/npcIqc/NpcIqcMapper.xml
@@ -12,6 +12,7 @@
             s.supplier_name,
             n.date_received,
             n.item_code,
+            p.part_desc AS item_name,
             p.part_desc,
             n.quantity,
             n.sample_size,
@@ -28,6 +29,11 @@
             n.created_by,
             n.supplier_email,
             n.ca_request,
+            CASE n.ca_request
+                WHEN 1 THEN '是'
+                WHEN 0 THEN '否'
+                ELSE '否'
+            END AS ca_request_text,
             n.rework_hours,
             n.rework_rate,
             n.rework_total,
@@ -70,6 +76,15 @@
             <if test="npciqc.purOrder != null and npciqc.purOrder != ''">
                 AND n.pur_order = #{npciqc.purOrder}
             </if>
+            <if test="npciqc.issueNo != null and npciqc.issueNo != ''">
+                AND n.issue_no LIKE CONCAT('%', #{npciqc.issueNo}, '%')
+            </if>
+            <if test="npciqc.dateReceivedStart != null and npciqc.dateReceivedStart != ''">
+                AND CAST(n.date_received AS DATE) &gt;= #{npciqc.dateReceivedStart}
+            </if>
+            <if test="npciqc.dateReceivedEnd != null and npciqc.dateReceivedEnd != ''">
+                AND CAST(n.date_received AS DATE) &lt;= #{npciqc.dateReceivedEnd}
+            </if>
         </where>
         ORDER BY n.entry_date DESC, n.iqc_no DESC
     </select>