From da5094f2b971076db2b09faf78ee6fc65e35f7c7 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 16 十二月 2025 13:21:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hckx' into hckx
---
src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml | 3 ++-
src/main/resources/mapper/device/DeviceRepairMapper.xml | 2 +-
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java | 4 ++++
src/main/resources/mapper/quality/QualityInspectMapper.xml | 1 +
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
index 4f2aff9..bc319ac 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
@@ -112,4 +112,8 @@
@Excel(name = "涓嶅惈绋庢�讳环")
private BigDecimal taxExclusiveTotalPrice;
+ /**
+ * 鐗╁搧绫诲瀷
+ */
+ private String itemType;
}
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index ab11bd2..d093980 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -33,7 +33,7 @@
and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
</if>
<if test="deviceRepairDto.status != null">
- and dl.status = #{deviceRepairDto.status}
+ and dr.status = #{deviceRepairDto.status}
</if>
<if test="deviceRepairDto.remark != null">
and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
index 830b0d9..1d67c65 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -145,7 +145,8 @@
t2.tax_exclusive_total_price,
t1.inbound_num,
t1.create_time,
- t1.create_by
+ t1.create_by,
+ t2.item_type
from procurement_record_out t1
left join custom_storage t2 on t2.id = t1.procurement_record_storage_id
<where>
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 1c75087..8344fc5 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -25,6 +25,7 @@
<if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
AND check_time <= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
</if>
+ ORDER BY check_time DESC
</select>
<select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">
SELECT
--
Gitblit v1.9.3