From 852d294263831752a184fa8a16f33aafee7ba309 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 29 一月 2026 13:48:43 +0800
Subject: [PATCH] 不合格管理：新增OA审核状态、物料属性，时间区间字段；以及导出功能
---
inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml | 67 +++++++++++++++++++++------------
1 files changed, 42 insertions(+), 25 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml b/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
index c91b2c0..2b65479 100644
--- a/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
@@ -12,31 +12,48 @@
unqualified_desc,inventory_quantity_id
</sql>
<select id="selectPageList" resultType="com.ruoyi.inspect.vo.UnqualifiedHandlerVO">
- select * from (select
- iiq.*,
- iuh.id as handler_id,
- iuh.no,
- iuh.material_name,
- iuh.production_batch,
- iuh.cargo_quantity,
- iuh.specs_models,
- iuh.inspect_time,
- iuh.feedback_user,
- iuh.feedback_time,
- iuh.classification,
- iuh.off_grade_ascription,
- iuh.unqualified_desc,
- iuh.inventory_quantity_id,
- iuh.oa_state,
- iuh.request_id,
- iuh.file_url,
- iuh.headline
- from
- ins_unqualified_handler iuh
- inner join
- ifs_inventory_quantity iiq
- on
- iuh.inventory_quantity_id = iiq.id)tempA
+ select
+ *
+ from (
+ select
+ iiq.*,
+ iuh.id as handler_id,
+ iuh.no,
+ iuh.material_name,
+ iuh.production_batch,
+ iuh.cargo_quantity,
+ iuh.specs_models,
+ iuh.inspect_time,
+ iuh.feedback_user,
+ iuh.feedback_time,
+ iuh.classification,
+ iuh.off_grade_ascription,
+ iuh.unqualified_desc,
+ iuh.inventory_quantity_id,
+ iuh.oa_state,
+ iuh.request_id,
+ iuh.file_url,
+ iuh.headline,
+ coa.operation
+ from
+ ins_unqualified_handler iuh
+ inner join
+ ifs_inventory_quantity iiq
+ on
+ iuh.inventory_quantity_id = iiq.id
+ LEFT JOIN (
+ SELECT
+ *,
+ ROW_NUMBER() OVER (PARTITION BY workflow_id ORDER BY approval_time DESC, id DESC) AS rn
+ FROM
+ common_oa
+ ) AS coa ON iuh.request_id = coa.workflow_id AND coa.rn = 1
+ )tempA
+ <where>
+ <if test="feedbackStartDate!=null and feedbackEndDate !=null">
+ AND feedback_time between #{feedbackStartDate} AND #{feedbackEndDate}
+ </if>
+ </where>
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
--
Gitblit v1.9.3