From e39c7ba23d87c222960526f6ee90b38b2f73c2b1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 27 八月 2026 15:40:10 +0800
Subject: [PATCH] feat: 移除1.MQTT对接 2.外部人事系统 3.MES 推送 4.OA提交参数
---
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index 61812e8..ae8c4d5 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -90,7 +90,7 @@
</sql>
<select id="selectStandardTreeList" resultMap="FactoryDto">
- select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
+ select '' factory,
l.laboratory_name laboratory,
sto.specimen_name sample_type,
p.name sample,
@@ -156,7 +156,7 @@
</select>
<select id="selectStandardTreeList2" resultType="com.ruoyi.basic.pojo.StandardTree">
- select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
+ select '' factory,
l.laboratory_name laboratory,
sto.specimen_name sample_type,
p.name sample
@@ -237,7 +237,7 @@
where name = #{name}
</select>
<select id="selectStandardTreeListByPartNo" resultMap="FactoryDto">
- select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
+ select '' factory,
l.laboratory_name laboratory,
sto.specimen_name sample_type,
p.name sample,
@@ -280,10 +280,12 @@
ir1.id enter_report_id,
ir1.url enter_url,
ir1.url_s enter_url_s,
+ ir1.is_ratify enter_ratify_status,
io2.id quarter_order_id,
ir2.id quarter_report_id,
ir2.url quarter_url,
ir2.url_s quarter_url_s,
+ ir2.is_ratify quarter_ratify_status,
group_concat(distinct isa.sample_code, ' ') sample_code,
group_concat(distinct isa.sample, ' ') sample_name,
group_concat(distinct isa.model, ' ') sample_model,
@@ -317,7 +319,7 @@
order by send_time desc
</select>
- <select id="selectIfsPage" resultType="com.ruoyi.basic.pojo.IfsInventoryQuantity">
+ <select id="selectIfsPage" resultType="com.ruoyi.basic.vo.IfsInventoryQuantityVO">
SELECT * from ifs_inventory_quantity ifs
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
--
Gitblit v1.9.3