From 02e13964dd95077c5f515156bc0da5187f5c8cf3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 19 六月 2024 11:49:37 +0800
Subject: [PATCH] 工时分组排序+制单人字段
---
inspect-server/src/main/resources/mapper/StandardTreeMapper.xml | 65 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 30 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
index b0072ed..e0590ad 100644
--- a/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -3,7 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.StandardTreeMapper">
-
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.StandardTree">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
@@ -47,10 +46,10 @@
</resultMap>
<select id="selectStandardTreeList" resultMap="FactoryDto">
- select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
- l.laboratory_name laboratory,
- sto.specimen_name sample_type,
- p.name sample,
+ select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
+ l.laboratory_name laboratory,
+ sto.specimen_name sample_type,
+ p.name sample,
st.model,
sto.code
from laboratory l
@@ -58,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">
@@ -117,10 +116,10 @@
</if>
</select>
<select id="selectStandardTreeList2" resultType="com.yuanchu.mom.pojo.StandardTree">
- select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
- l.laboratory_name laboratory,
- sto.specimen_name sample_type,
- p.name sample
+ select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
+ l.laboratory_name laboratory,
+ sto.specimen_name sample_type,
+ p.name sample
from laboratory l
left join structure_test_object sto on sto.laboratory_id = l.id
left join product p on p.object_id = sto.id
@@ -131,7 +130,7 @@
group by sto.specimen_name
</select>
<select id="selectStandardProductListByTree" resultType="com.yuanchu.mom.pojo.StandardProductList">
- select sample sample2,
+ select sample sample2,
inspection_item,
inspection_item_en,
inspection_item_subclass,
@@ -141,7 +140,7 @@
method,
son_laboratory,
unit,
- ask_tell tell,
+ ask_tell tell,
ask,
price,
man_hour,
@@ -155,11 +154,11 @@
checkout_number,
section,
dic,
- 0 state,
- #{model} model,
+ 0 state,
+ #{model} model,
#{sample} sample,
- #{trees} tree,
- id structure_item_parameter_id
+ #{trees} tree,
+ id structure_item_parameter_id
from structure_item_parameter
where (
sample is NULL
@@ -167,10 +166,12 @@
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
</select>
<select id="selectStandardProductListByTree2" resultType="com.yuanchu.mom.pojo.StandardProductList">
- select sample sample2,
+ select sample sample2,
inspection_item,
inspection_item_en,
inspection_item_subclass,
@@ -180,7 +181,7 @@
method,
son_laboratory,
unit,
- ask_tell tell,
+ ask_tell tell,
ask,
price,
man_hour,
@@ -194,13 +195,15 @@
checkout_number,
section,
dic,
- 0 state,
- #{model} model,
+ 0 state,
+ #{model} model,
#{sample} sample,
- #{trees} tree,
- id structure_item_parameter_id
+ #{trees} tree,
+ 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
</select>
<select id="getStandardTree2" resultMap="SampleTypeDto">
@@ -213,7 +216,7 @@
and st.sample = p.name
</select>
<select id="selectStandardProductListByTree3" resultType="com.yuanchu.mom.pojo.StandardProductList">
- select sample sample2,
+ select sample sample2,
inspection_item,
inspection_item_en,
inspection_item_subclass,
@@ -223,7 +226,7 @@
method,
son_laboratory,
unit,
- ask_tell tell,
+ ask_tell tell,
ask,
price,
man_hour,
@@ -237,11 +240,11 @@
checkout_number,
section,
dic,
- 0 state,
- #{model} model,
+ 0 state,
+ #{model} model,
#{sample} sample,
- #{trees} tree,
- id structure_item_parameter_id
+ #{trees} tree,
+ id structure_item_parameter_id
from structure_item_parameter
where (
sample is NULL
@@ -249,18 +252,20 @@
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
</select>
<select id="getStandardTree3" resultType="com.yuanchu.mom.dto.SampleDto">
select model label,
model value
from standard_tree
where sample_type = #{sampleType}
- and sample is null
+ and sample is null
</select>
<select id="getLaboratory" resultType="java.lang.String">
select l.laboratory_name
from structure_test_object sto
- left join laboratory l on sto.laboratory_id = l.id
+ left join laboratory l on sto.laboratory_id = l.id
where sto.specimen_name = #{str}
</select>
<select id="getStructureItemParameterId" resultType="java.lang.Integer">
--
Gitblit v1.9.3