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/procurementrecord/ProcurementRecordOutMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
index 4b8416e..ec91c53 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -7,6 +7,7 @@
t3.supplier_name,
t2.product_category,
t1.id,
+ t1.code,
t2.specification_model,
t2.unit,
t2.tax_rate,
@@ -15,7 +16,8 @@
t2.tax_exclusive_total_price,
t1.inbound_num,
t1.create_time,
- t1.create_by
+ t1.create_by,
+ t2.warn_num
from procurement_record_out t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
@@ -23,6 +25,9 @@
1 = 1
<if test="req.supplierName != null and req.supplierName != ''">
and t3.supplier_name like concat('%',#{req.supplierName},'%')
+ </if>
+ <if test="req.timeStr != null and req.timeStr != ''">
+ and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
</where>
</select>
@@ -39,6 +44,7 @@
t2.tax_exclusive_total_price,
t1.inbound_num,
t1.create_time,
+ t1.create_time as time,
t1.create_by
from procurement_record_out t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
--
Gitblit v1.9.3