From f3bb76fa668530d5613700e57a30e6c7394d5224 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 06 三月 2025 16:50:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
basic-server/src/main/resources/mapper/StandardMethodListMapper.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml b/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml
index 25c6462..957fd1f 100644
--- a/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardMethodListMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.StandardMethodList">
+ <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StandardMethodList">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="code" column="code" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
@@ -25,14 +25,14 @@
from user
where id = #{id}
</select>
- <select id="selectStandardMethodLists" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
+ <select id="selectStandardMethodLists" resultType="com.ruoyi.basic.pojo.StandardMethodList">
select id, code, name, remark
from standard_method
where is_use = 1
and is_product = 1
and structure_test_object_id LIKE CONCAT('%[', #{tree}, ']%')
</select>
- <select id="selectParameterList" resultType="com.ruoyi.inspect.pojo.StandardProductList">
+ <select id="selectParameterList" resultType="com.ruoyi.basic.pojo.StandardProductList">
select inspection_item,
inspection_item_subclass,
laboratory,
@@ -52,7 +52,7 @@
from structure_item_parameter
where method = #{code}
</select>
- <select id="selectStandardMethodLists2" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
+ <select id="selectStandardMethodLists2" resultType="com.ruoyi.basic.pojo.StandardMethodList">
select sml.id, sml.code, sml.name,sml.remark, sml.create_time, u.name create_user_name
from standard_method_list sml
left join user u on u.id = sml.create_user
@@ -70,19 +70,19 @@
and model = #{data5}
</if>
</select>
- <select id="selectStandardMethodLists3" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
+ <select id="selectStandardMethodLists3" resultType="com.ruoyi.basic.pojo.StandardMethodList">
select id, code, name, remark
from standard_method
where is_use = 1
and is_product = 1
and structure_test_object_id LIKE CONCAT('%', #{tree}, '%')
</select>
- <select id="selectListEnum" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
+ <select id="selectListEnum" resultType="com.ruoyi.basic.pojo.StandardMethodList">
select id,code,name from standard_method
where is_product = 1
and is_use = 1
</select>
- <select id="selectStandardMethodListsByNull" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
+ <select id="selectStandardMethodListsByNull" resultType="com.ruoyi.basic.pojo.StandardMethodList">
select id, code, name, remark
from standard_method
where is_use = 1
--
Gitblit v1.9.3