From 3547641f25634eec4b6dcf379080e92ed5025ee1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 21 六月 2024 14:21:52 +0800
Subject: [PATCH] 解决工时排序问题+考评bug调试
---
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index b461dc1..a01d630 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -57,7 +57,7 @@
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
- order by l.id, CAST(sto.code AS DECIMAL), p.id, ISNULL(st.id), st.id
+ order by l.id, CAST(sto.code AS DECIMAL), p.id, ISNULL (st.id), st.id
</select>
<select id="selectStandardProductById" resultType="com.yuanchu.mom.pojo.StandardProductList">
@@ -166,8 +166,13 @@
or sample = '[]'
OR sample LIKE CONCAT('%[', #{tree}, ']%')
)
- order by case when man_hour_group is NULL then 1 else 0 end, CAST(man_hour_group as UNSIGNED),
- man_hour_group REGEXP '^[0-9]', id asc
+ order by case when man_hour_group is NULL then 1
+ when man_hour_group ='' then 1 else 0 end,
+ CASE
+ WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- 濡傛灉浠ユ暟瀛楀紑澶达紝鍒欐寜鐓ф暟瀛楀ぇ灏忔帓搴�
+ WHEN man_hour_group REGEXP '[0-9]+' THEN CAST(SUBSTRING(man_hour_group, 2)AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
+
+ ,id asc
</select>
<select id="selectStandardProductListByTree2" resultType="com.yuanchu.mom.pojo.StandardProductList">
@@ -202,8 +207,13 @@
id structure_item_parameter_id
from structure_item_parameter
where sample LIKE CONCAT('%[', #{tree}, ']%')
- order by case when man_hour_group is NULL then 1 else 0 end, CAST(man_hour_group as UNSIGNED),
- man_hour_group REGEXP '^[0-9]', id asc
+ order by case when man_hour_group is NULL then 1
+ when man_hour_group ='' then 1 else 0 end,
+ CASE
+ WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- 濡傛灉浠ユ暟瀛楀紑澶达紝鍒欐寜鐓ф暟瀛楀ぇ灏忔帓搴�
+ WHEN man_hour_group REGEXP '[0-9]+' THEN CAST(SUBSTRING(man_hour_group, 2)AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
+
+ ,id asc
</select>
<select id="getStandardTree2" resultMap="SampleTypeDto">
@@ -252,8 +262,13 @@
or sample = '[]'
OR sample LIKE CONCAT('%', #{tree}, '%')
)
- order by case when man_hour_group is NULL then 1 else 0 end, CAST(man_hour_group as UNSIGNED),
- man_hour_group REGEXP '^[0-9]', id asc
+ order by case when man_hour_group is NULL then 1
+ when man_hour_group ='' then 1 else 0 end,
+ CASE
+ WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- 濡傛灉浠ユ暟瀛楀紑澶达紝鍒欐寜鐓ф暟瀛楀ぇ灏忔帓搴�
+ WHEN man_hour_group REGEXP '[0-9]+' THEN CAST(SUBSTRING(man_hour_group, 2)AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
+
+ ,id asc
</select>
<select id="getStandardTree3" resultType="com.yuanchu.mom.dto.SampleDto">
select model label,
@@ -280,8 +295,9 @@
</if>
</select>
<select id="selectPList" resultType="com.yuanchu.mom.dto.ProductDto">
- select p.name from structure_test_object sto
- left join product p on p.object_id = sto.id
+ select p.name
+ from structure_test_object sto
+ left join product p on p.object_id = sto.id
where sto.specimen_name = #{name}
order by p.id
</select>
--
Gitblit v1.9.3