From bd897b186f4dd82beb5a9f9f7f41555dcd77bf7e Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 07 一月 2026 14:35:46 +0800
Subject: [PATCH] 设备报修增添审批人id，维修价格字段，重整状态对应值。优化添加设备报修接口，同步数据到协同办公-报销管理。协同办公-报销管理的审核接口同步设备管理-设备报修状态。设备报修删除接口根据报销管理审核状态判断是否删除。
---
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index f4fb205..b15e3f9 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -7,14 +7,20 @@
FROM quality_unqualified
where
1=1
- <if test="qualityUnqualified.inspectType != null and qualityTestStandard.inspectType != '' ">
+ <if test="qualityUnqualified.inspectType != null ">
AND inspect_type = #{qualityUnqualified.inspectType}
</if>
- <if test="qualityUnqualified.inspectState != null and qualityTestStandard.inspectState != '' ">
+ <if test="qualityUnqualified.inspectState != null ">
AND inspect_state = #{qualityUnqualified.inspectState}
</if>
- <if test="qualityUnqualified.productName != null and qualityTestStandard.productName != '' ">
+ <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
AND product_name = #{qualityUnqualified.productName}
+ </if>
+ <if test="qualityUnqualified.entryDateStart != null and qualityUnqualified.entryDateStart != '' ">
+ AND check_time >= DATE_FORMAT(#{qualityUnqualified.entryDateStart},'%Y-%m-%d')
+ </if>
+ <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
+ AND check_time <= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
</if>
</select>
<select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
@@ -23,13 +29,13 @@
FROM quality_unqualified
where
1=1
- <if test="qualityUnqualified.inspectType != null and qualityTestStandard.inspectType != '' ">
+ <if test="qualityUnqualified.inspectType != null">
AND inspect_type = #{qualityUnqualified.inspectType}
</if>
- <if test="qualityUnqualified.inspectState != null and qualityTestStandard.inspectState != '' ">
+ <if test="qualityUnqualified.inspectState != null">
AND inspect_state = #{qualityUnqualified.inspectState}
</if>
- <if test="qualityUnqualified.productName != null and qualityTestStandard.productName != '' ">
+ <if test="qualityUnqualified.productName != null and qualityUnqualified.productName != '' ">
AND product_name = #{qualityUnqualified.productName}
</if>
</select>
--
Gitblit v1.9.3