From 021468486e1179c00670caa13349a844cc0abc0e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 04 三月 2025 17:25:15 +0800
Subject: [PATCH] 修改包路径
---
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 124 ++++------------------------------------
1 files changed, 14 insertions(+), 110 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index 74ded82..137857f 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardTreeMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StandardTree">
+ <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.StandardTree">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
@@ -16,19 +16,19 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <resultMap id="FactoryDto" type="com.ruoyi.basic.dto.FactoryDto">
+ <resultMap id="FactoryDto" type="com.ruoyi.inspect.dto.FactoryDto">
<result property="label" column="factory"/>
<result property="value" column="factory"/>
<collection property="children" resultMap="LaboratoryDto"/>
</resultMap>
- <resultMap id="LaboratoryDto" type="com.ruoyi.basic.dto.LaboratoryDto">
+ <resultMap id="LaboratoryDto" type="com.ruoyi.inspect.dto.LaboratoryDto">
<result property="label" column="laboratory"/>
<result property="value" column="laboratory"/>
<collection property="children" resultMap="SampleTypeDto"/>
</resultMap>
- <resultMap id="SampleTypeDto" type="com.ruoyi.basic.dto.SampleTypeDto">
+ <resultMap id="SampleTypeDto" type="com.ruoyi.inspect.dto.SampleTypeDto">
<result property="label" column="sample_type"/>
<result property="value" column="sample_type"/>
<result property="sampleTypeId" column="sample_type_id"/>
@@ -38,7 +38,7 @@
<collection property="children" resultMap="SampleDto"/>
</resultMap>
- <resultMap id="SampleDto" type="com.ruoyi.basic.dto.SampleDto">
+ <resultMap id="SampleDto" type="com.ruoyi.inspect.dto.SampleDto">
<result property="label" column="sample"/>
<result property="value" column="sample"/>
<result property="partNo" column="sample_part_no"/>
@@ -46,7 +46,7 @@
<collection property="children" resultMap="ModelDto"/>
</resultMap>
- <resultMap id="ModelDto" type="com.ruoyi.basic.dto.ModelDto">
+ <resultMap id="ModelDto" type="com.ruoyi.inspect.dto.ModelDto">
<result property="label" column="model"/>
<result property="value" column="model"/>
</resultMap>
@@ -108,7 +108,7 @@
order by l.id, CAST(sto.code AS DECIMAL), p.id, ISNULL(st.id), st.id
</select>
- <select id="selectStandardProductById" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="selectStandardProductById" resultType="com.ruoyi.inspect.pojo.StandardProductList">
select inspection_item,
inspection_item_subclass,
laboratory,
@@ -128,7 +128,7 @@
from structure_item_parameter
where id = #{id}
</select>
- <select id="getStandardProductListBySample" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="getStandardProductListBySample" resultType="com.ruoyi.inspect.pojo.StandardProductList">
select inspection_item,
inspection_item_subclass,
laboratory,
@@ -154,7 +154,7 @@
or sp.sample = ''
or sp.sample = '[]'
</select>
- <select id="getStandardMethodListBySample" resultType="com.ruoyi.basic.pojo.StandardMethodList">
+ <select id="getStandardMethodListBySample" resultType="com.ruoyi.inspect.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
@@ -163,7 +163,7 @@
and sto.specimen_name = #{sampleType}
</if>
</select>
- <select id="selectStandardTreeList2" resultType="com.ruoyi.basic.pojo.StandardTree">
+ <select id="selectStandardTreeList2" resultType="com.ruoyi.inspect.pojo.StandardTree">
select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
l.laboratory_name laboratory,
sto.specimen_name sample_type,
@@ -177,7 +177,7 @@
where sto.specimen_name = #{sampleType}
group by sto.specimen_name
</select>
- <select id="selectStandardProductListByTree" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="selectStandardProductListByTree" resultType="com.ruoyi.inspect.pojo.StandardProductList">
select <include refid="selectStandardTree"/>
from structure_item_parameter
where (
@@ -192,7 +192,7 @@
order by inspection_item_class, inspection_item, id asc
</select>
- <select id="selectStandardProductListByTree2" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="selectStandardProductListByTree2" resultType="com.ruoyi.inspect.pojo.StandardProductList">
select <include refid="selectStandardTree"/>
from structure_item_parameter
where sample LIKE CONCAT('%[', #{tree}, ']%')
@@ -212,7 +212,7 @@
and st.sample = p.name
</select>
- <select id="getStandardTree3" resultType="com.ruoyi.basic.dto.SampleDto">
+ <select id="getStandardTree3" resultType="com.ruoyi.inspect.dto.SampleDto">
select model label,
model value
from standard_tree
@@ -240,7 +240,7 @@
and (inspection_item_subclass is null or inspection_item_subclass = '')
</if>
</select>
- <select id="selectPList" resultType="com.ruoyi.basic.dto.ProductDto">
+ <select id="selectPList" resultType="com.ruoyi.inspect.dto.ProductDto">
select p.name
from structure_test_object sto
left join product p on p.object_id = sto.id
@@ -284,101 +284,5 @@
from structure_test_object_part sto
where sto.part_no = #{partNo}))
order by l.id, CAST(sto.code AS DECIMAL), p.id, ISNULL(st.id), st.id
- </select>
-
- <sql id="getIfsOrder">
- select *
- from (SELECT ifs.*,
- COALESCE(io1.create_user, io2.create_user) create_user,
- COALESCE(io1.entrust_code, io2.entrust_code) entrust_code,
- COALESCE(io1.send_time, io2.send_time) send_time,
- io1.id enter_order_id,
- ir1.id enter_report_id,
- ir1.url enter_url,
- ir1.url_s enter_url_s,
- io2.id quarter_order_id,
- ir2.id quarter_report_id,
- ir2.url quarter_url,
- ir2.url_s quarter_url_s,
- group_concat(distinct isa.sample_code, ' ') sample_code,
- group_concat(distinct isa.sample, ' ') sample_name,
- group_concat(distinct isa.model, ' ') sample_model,
- COALESCE(io1.state, io2.state) order_state,
- COALESCE(isu.userName, COALESCE(u1.name, u2.name)) user_name,
- group_concat(distinct iuh.unqualified_desc, ' ') unqualified_desc,
- io1.is_exemption
- FROM ifs_inventory_quantity ifs
- LEFT JOIN ins_order io1 ON io1.ifs_inventory_id = ifs.id and io1.order_type = '杩涘巶妫�楠�' and io1.state != -1
- left join ins_report ir1 on io1.id = ir1.ins_order_id
- left join user u1 on io1.create_user = u1.id
- LEFT JOIN ins_order io2 ON io2.ifs_inventory_id = ifs.id and io2.order_type = 'Quarterly inspection' and io2.state != -1
- left join ins_report ir2 on io2.id = ir2.ins_order_id
- left join user u2 on io2.create_user = u2.id
- LEFT JOIN ins_sample isa ON COALESCE(io1.id, io2.id) = isa.ins_order_id
- LEFT JOIN (SELECT ins_sample_id, GROUP_CONCAT(DISTINCT uu.name SEPARATOR ',') AS userName
- FROM ins_sample_user u
- LEFT JOIN user uu ON u.user_id = uu.id
- WHERE u.state = 0
- GROUP BY ins_sample_id
- ORDER BY ins_sample_id) isu ON isu.ins_sample_id = COALESCE(io1.id, io2.id)
- left join ins_unqualified_handler iuh on iuh.inventory_quantity_id = ifs.id
- group by ifs.id) a
- </sql>
-
- <select id="getIfsByStateOne" resultType="com.ruoyi.basic.dto.IfsInventoryQuantityDto">
- <include refid="getIfsOrder"/>
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
-
- <select id="selectIfsPage" resultType="com.ruoyi.basic.pojo.IfsInventoryQuantity">
- SELECT * from ifs_inventory_quantity ifs
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
- <select id="selectIfsInventoryQuantity" resultType="com.ruoyi.basic.dto.IfsInventoryQuantityCheckDto">
- SELECT * from ifs_inventory_quantity ifs
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
- <select id="getIfsByOver" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
- select * from (<include refid="getIfsOrder"/>
- <where>
- <if test="beginDeclareDate != null and beginDeclareDate != '' and endDeclareDate != null and endDeclareDate != ''">
- send_time between #{beginDeclareDate} and #{endDeclareDate}
- </if>
- </where>
- ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
- <select id="getIfsByOverList" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
- select * from (<include refid="getIfsOrder"/>
- <where>
- <if test="beginDeclareDate != null and beginDeclareDate != '' and endDeclareDate != null and endDeclareDate != ''">
- send_time between #{beginDeclareDate} and #{endDeclareDate}
- </if>
- </where>
- ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
- <select id="getIfsByQuarter" resultType="com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto">
- select * from (<include refid="getIfsOrder"/>
- <where>
- and (quarter_order_id is not null)
- <if test="beginDeclareDate != null and beginDeclareDate != '' and endDeclareDate != null and endDeclareDate != ''">
- and send_time between #{beginDeclareDate} and #{endDeclareDate}
- </if>
- </where>
- ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
</select>
</mapper>
--
Gitblit v1.9.3