From 578bfcb3f58c5458d2c60fe37c3e56ebcda98e18 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 05 三月 2025 15:15:03 +0800
Subject: [PATCH] 标准功能搬迁
---
basic-server/src/main/resources/mapper/StandardProductListMapper.xml | 88 +++++++++++++++----------------------------
1 files changed, 31 insertions(+), 57 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
index 112ae89..7d06d0c 100644
--- a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardProductListMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.StandardProductList">
+ <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StandardProductList">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
<result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
@@ -27,35 +27,7 @@
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <update id="updateSection">
- UPDATE standard_product_list
- SET price=#{productList.price},
- man_hour=#{productList.manHour},
- section=#{productList.section},
- cores=#{productList.cores},
- conductor_material=#{productList.conductorMaterial},
- conductor_type=#{productList.conductorType},
- ask=#{productList.ask},
- tell=#{productList.tell},
- update_user=#{productList.updateUser},
- update_time=#{productList.updateTime}
- WHERE id = #{productList.id}
- </update>
- <update id="updateSortUp">
- update standard_product_list
- set sort = sort - 1
- where tree = #{tree}
- and standard_method_list_id = #{methodId}
- and sort between #{beginIndex} + 1 and #{endIndex}
- </update>
- <update id="updateSortDown">
- update standard_product_list
- set sort = sort + 1
- where tree = #{tree}
- and standard_method_list_id = #{methodId}
- and sort between #{endIndex} and #{beginIndex} - 1
- </update>
- <select id="standardProductListIPage" resultType="com.ruoyi.inspect.pojo.StandardProductList">
+ <select id="standardProductListIPage" resultType="com.ruoyi.basic.pojo.StandardProductList">
select spl.* from standard_product_list spl
left join product p on spl.sample = p.name
where standard_method_list_id = #{id}
@@ -72,7 +44,7 @@
order by p.id
group by spl.id
</select>
- <select id="getOne" resultType="com.ruoyi.inspect.pojo.StandardProductList">
+ <select id="getOne" resultType="com.ruoyi.basic.pojo.StandardProductList">
select * from standard_product_list
where standard_method_list_id = #{standardMethodListId}
and inspection_item = #{inspectionItem}
@@ -92,18 +64,17 @@
and inspection_item_class = #{inspectionItemClass}
</if>
</select>
- <select id="selectDetail" resultType="com.ruoyi.inspect.pojo.StandardProductList">
+ <select id="selectDetail" resultType="com.ruoyi.basic.pojo.StandardProductList">
select * from standard_product_list
where standard_method_list_id = #{standardMethodListId}
and state =#{state}
and model=#{model}
- <if test="isCableTag != null and isCableTag != ''">
- and (inspection_item_class like concat('%缁撴瀯灏哄%') or
- inspection_item_class like concat('%鐢电紗鐢垫�ц兘%')or
- inspection_item_class like concat('%缁濈紭%')or
- inspection_item_class like concat('%鐢电紗鐕冪儳鎬ц兘%'))
+ <if test="sampleType != null and sampleType != ''">
+ and sample_type =#{sampleType}
</if>
- order by sort asc,
+ <if test="sample != null and sample != ''">
+ and sample =#{sample}
+ </if>
case when man_hour_group is NULL then 1
when man_hour_group ='' then 1 else 0 end,
CASE
@@ -111,34 +82,37 @@
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.ruoyi.inspect.pojo.StandardProductList">
+ <select id="selectDetail2" resultType="com.ruoyi.basic.pojo.StandardProductList">
select * from standard_product_list
where standard_method_list_id = #{standardMethodListId}
and state =#{state}
and tree =#{tree}
- <if test="isCableTag != null and isCableTag != ''">
- and (inspection_item_class like concat('%缁撴瀯灏哄%') or
- inspection_item_class like concat('%鐢电紗鐢垫�ц兘%')or
- inspection_item_class like concat('%缁濈紭%')or
- inspection_item_class like concat('%鐢电紗鐕冪儳鎬ц兘%'))
- </if>
- order by sort asc,
- case when man_hour_group is NULL then 1
+ 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="selectPartColor" resultType="java.util.Map">
- select color,
- color_code
- from product_part
- where part_no = #{partNo}
- union all
- select color,
- color_code
- from structure_test_object_part
- where part_no = #{partNo}
+
+
+ <select id="getStandardProductByInsProduct" resultType="com.ruoyi.basic.vo.StandardProductVO">
+ select
+ CASE
+ WHEN man_hour is null or man_hour='' THEN '0'
+ ELSE man_hour
+ END AS man_hour,
+ man_hour_group,
+ section
+ from standard_product_list
+ where (laboratory = #{laboratory} or laboratory is null or laboratory='')
+ and sample_type = #{sampleType}
+ and (sample = #{sample} or sample is null or sample='')
+ and (model = #{model} or model is null or model='')
+ and inspection_item=#{inspectionItem}
+ and (inspection_item_subclass=#{inspectionItemSubclass} or inspection_item_subclass is null or inspection_item_subclass='')
+ and (son_laboratory = #{sonLaboratory} or son_laboratory is null or son_laboratory='')
+ and standard_method_list_id=#{standardMethodListId}
+ and state=1
</select>
</mapper>
--
Gitblit v1.9.3