From 95786582ad848ba99ebcc716c6ecf24e90f8c3d5 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 19 五月 2025 10:29:08 +0800
Subject: [PATCH] 工时添加判断是否有检验值,没有检验值默认填充工时
---
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index 74ded82..4060428 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -154,15 +154,7 @@
or sp.sample = ''
or sp.sample = '[]'
</select>
- <select id="getStandardMethodListBySample" resultType="com.ruoyi.basic.pojo.StandardMethodList">
- select sm.code,sm.name,sm.remark from standard_method sm
- left join structure_test_object sto on sm.structure_test_object_id = sto.id
- where is_use = 1
- and is_product = 1
- <if test="sampleType != null">
- and sto.specimen_name = #{sampleType}
- </if>
- </select>
+
<select id="selectStandardTreeList2" resultType="com.ruoyi.basic.pojo.StandardTree">
select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
l.laboratory_name laboratory,
@@ -210,14 +202,6 @@
left join product p on p.object_id = sto.id
left join standard_tree st on st.sample_type = sto.specimen_name
and st.sample = p.name
- </select>
-
- <select id="getStandardTree3" resultType="com.ruoyi.basic.dto.SampleDto">
- select model label,
- model value
- from standard_tree
- where sample_type = #{sampleType}
- and sample is null
</select>
<select id="getLaboratory" resultType="java.lang.String">
@@ -330,6 +314,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
+ order by send_time desc
</select>
<select id="selectIfsPage" resultType="com.ruoyi.basic.pojo.IfsInventoryQuantity">
@@ -337,6 +322,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
+ ORDER BY declare_date DESC
</select>
<select id="selectIfsInventoryQuantity" resultType="com.ruoyi.basic.dto.IfsInventoryQuantityCheckDto">
SELECT * from ifs_inventory_quantity ifs
@@ -355,6 +341,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
+ order by send_time desc
</select>
<select id="getIfsByOverList" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
select * from (<include refid="getIfsOrder"/>
@@ -381,4 +368,34 @@
${ew.customSqlSegment}
</if>
</select>
+
+ <select id="getStandardTree3Batch" resultType="com.ruoyi.basic.dto.SampleDto">
+ select model label,
+ model value
+ from standard_tree
+ where sample is null
+ <if test="sampleTypeValues != null and sampleTypeValues.size() > 0">
+ and sample_type in
+ <foreach item="item" collection="sampleTypeValues" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ </select>
+
+ <select id="getStandardTree3" resultType="com.ruoyi.basic.dto.SampleDto">
+ select model label,
+ model value
+ from standard_tree
+ where sample_type = #{sampleType}
+ and sample is null
+ </select>
+
+ <!-- 鏍规嵁鍘熸潗鏂檌d鍒楄〃鏌ヨ鍘熸潗鏂欎俊鎭� -->
+ <select id="getIfsByIds" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
+ <include refid="getIfsOrder"/>
+ where id in
+ <foreach item="id" collection="ifsIds" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </select>
</mapper>
--
Gitblit v1.9.3