From 08923c6d95dc8f0f415de94e1d4e3230cdcf7a8e Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 14 十一月 2024 15:42:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml
index 3451506..84df17f 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml
+++ b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml
@@ -68,6 +68,7 @@
LEFT JOIN t_mpk_method_setting c ON b.id = c.method_id
LEFT JOIN t_mpk_setting_select d ON c.id = d.setting_id
WHERE a.id = #{id}
+ ORDER BY b.sort,c.sort,d.sort
</select>
<select id="selectByIds" resultMap="mpkFile">
SELECT
@@ -93,10 +94,13 @@
LEFT JOIN t_mpk_model_method b ON a.id = b.mpk_file_id
LEFT JOIN t_mpk_method_setting c ON b.id = c.method_id
LEFT JOIN t_mpk_setting_select d ON c.id = d.setting_id
+ LEFT JOIN t_mpk_file_menu e ON e.name = a.menu_name
+ LEFT JOIN t_mpk_file_group f ON f.menu_id = e.id and f.name = a.group_name
WHERE a.id in
<foreach collection="ids" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
+ ORDER BY b.sort,c.sort,d.sort,e.sort,f.sort,a.create_date
</select>
<select id="getProjectModelCount" resultType="java.lang.Integer" parameterType="java.lang.String">
SELECT
@@ -109,6 +113,7 @@
<select id="getProjectModel" resultMap="mpkFile">
SELECT
t3.*,
+ t4.id method_id,
t4.method_name,
t4.data_length,
t4.model,
@@ -127,12 +132,7 @@
FROM
(
SELECT
- t2.id,
- t2.py_name,
- t2.pkg_name,
- t2.py_module,
- t2.remark,
- t2.create_date
+ t2.*
FROM
t_mpk_project_model t1
LEFT JOIN t_mpk_file t2 ON t1.model_id = t2.id
--
Gitblit v1.9.3