From 22d3a8dc4185c5461bee9e42a9f4a2775ff448e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 10 九月 2024 17:28:17 +0800
Subject: [PATCH] 报告更改+再次试验
---
inspect-server/src/main/resources/mapper/StandardProductListMapper.xml | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
index a696171..3202056 100644
--- a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -7,7 +7,6 @@
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.StandardProductList">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
- <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
<result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
<result property="unit" column="unit" jdbcType="VARCHAR"/>
@@ -30,18 +29,21 @@
</resultMap>
<select id="standardProductListIPage" resultType="com.yuanchu.mom.pojo.StandardProductList">
- select * from `center-lims`.standard_product_list
+ select spl.* from `center-lims`.standard_product_list spl
+ left join product p on spl.sample = p.name
where standard_method_list_id = #{id}
and tree like concat('%',#{tree},'%')
<if test="laboratory != ''">
and son_laboratory = #{laboratory}
</if>
- <if test="item != ''">
- and inspection_item = #{item}
+ <if test="insItem != ''">
+ and inspection_item = #{insItem}
</if>
- <if test="items != ''">
- and inspection_item_subclass = #{items}
+ <if test="insItems != ''">
+ and inspection_item_subclass = #{insItems}
</if>
+ group by spl.id
+ order by p.id
</select>
<select id="getOne" resultType="com.yuanchu.mom.pojo.StandardProductList">
select * from standard_product_list
@@ -53,8 +55,38 @@
<if test="inspectionItemSubclass!=null">
and inspection_item_subclass = #{inspectionItemSubclass}
</if>
+ <if test="inspectionItemSubclass == null">
+ and (inspection_item_subclass is null or inspection_item_subclass = '')
+ </if>
<if test="model!=null">
and model = #{model}
</if>
+ <if test="inspectionItemClass != null and inspectionItemClass != ''">
+ and inspection_item_class = #{inspectionItemClass}
+ </if>
+ </select>
+ <select id="selectDetail" resultType="com.yuanchu.mom.pojo.StandardProductList">
+ select * from standard_product_list
+ where standard_method_list_id = #{standardMethodListId}
+ and state =#{state}
+ and model=#{model}
+ 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="selectDetail2" resultType="com.yuanchu.mom.pojo.StandardProductList">
+ select * from standard_product_list
+ where standard_method_list_id = #{standardMethodListId}
+ and state =#{state}
+ and tree =#{tree}
+ 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>
</mapper>
--
Gitblit v1.9.3