From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 java110-db/src/main/resources/mapper/user/MenuGroupCatalogV1ServiceDaoImplMapper.xml |  133 +++++++++++++++++++++----------------------
 1 files changed, 65 insertions(+), 68 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/MenuGroupCatalogV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/MenuGroupCatalogV1ServiceDaoImplMapper.xml
index df6923b..2524a75 100644
--- a/java110-db/src/main/resources/mapper/user/MenuGroupCatalogV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/MenuGroupCatalogV1ServiceDaoImplMapper.xml
@@ -5,93 +5,90 @@
 <mapper namespace="menuGroupCatalogV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 淇濆瓨鑿滃崟鐩綍缁勪俊鎭� add by wuxw 2018-07-03 -->
     <insert id="saveMenuGroupCatalogInfo" parameterType="Map">
         insert into m_menu_group_catalog(
-store_type,g_id,gc_id,ca_id
-) values (
-#{storeType},#{gId},#{gcId},#{caId}
-)
+        store_type,g_id,gc_id,ca_id
+        ) values (
+        #{storeType},#{gId},#{gcId},#{caId}
+        )
     </insert>
-
 
 
     <!-- 鏌ヨ鑿滃崟鐩綍缁勪俊鎭� add by wuxw 2018-07-03 -->
     <select id="getMenuGroupCatalogInfo" parameterType="Map" resultType="Map">
-        select  t.store_type,t.store_type storeType,t.g_id,t.g_id gId,t.gc_id,t.gc_id gcId,t.ca_id,t.ca_id caId,t.status_cd,t.status_cd statusCd 
-from m_menu_group_catalog t 
-where 1 =1 
-<if test="storeType !=null and storeType != ''">
-   and t.store_type= #{storeType}
-</if> 
-<if test="gId !=null and gId != ''">
-   and t.g_id= #{gId}
-</if> 
-<if test="gcId !=null and gcId != ''">
-   and t.gc_id= #{gcId}
-</if> 
-<if test="caId !=null and caId != ''">
-   and t.ca_id= #{caId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.store_type,t.store_type storeType,t.g_id,t.g_id gId,t.gc_id,t.gc_id gcId,t.ca_id,t.ca_id
+        caId,t.status_cd,t.status_cd statusCd,mg.`name` mgName
+        from m_menu_group_catalog t
+        left join m_menu_group mg on t.g_id = mg.g_id and t.store_type = mg.store_type and mg.status_cd = '0'
+        where 1 =1
+        <if test="storeType !=null and storeType != ''">
+            and t.store_type= #{storeType}
+        </if>
+        <if test="gId !=null and gId != ''">
+            and t.g_id= #{gId}
+        </if>
+        <if test="gcId !=null and gcId != ''">
+            and t.gc_id= #{gcId}
+        </if>
+        <if test="caId !=null and caId != ''">
+            and t.ca_id= #{caId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 淇敼鑿滃崟鐩綍缁勪俊鎭� add by wuxw 2018-07-03 -->
     <update id="updateMenuGroupCatalogInfo" parameterType="Map">
-        update  m_menu_group_catalog t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="storeType !=null and storeType != ''">
-, t.store_type= #{storeType}
-</if> 
-<if test="gId !=null and gId != ''">
-, t.g_id= #{gId}
-</if> 
-<if test="caId !=null and caId != ''">
-, t.ca_id= #{caId}
-</if> 
- where 1=1 <if test="gcId !=null and gcId != ''">
-and t.gc_id= #{gcId}
-</if> 
+        update m_menu_group_catalog t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="storeType !=null and storeType != ''">
+            , t.store_type= #{storeType}
+        </if>
+        <if test="gId !=null and gId != ''">
+            , t.g_id= #{gId}
+        </if>
+        <if test="caId !=null and caId != ''">
+            , t.ca_id= #{caId}
+        </if>
+        where 1=1
+        <if test="gcId !=null and gcId != ''">
+            and t.gc_id= #{gcId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ鑿滃崟鐩綍缁勬暟閲� add by wuxw 2018-07-03 -->
-     <select id="queryMenuGroupCatalogsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from m_menu_group_catalog t 
-where 1 =1 
-<if test="storeType !=null and storeType != ''">
-   and t.store_type= #{storeType}
-</if> 
-<if test="gId !=null and gId != ''">
-   and t.g_id= #{gId}
-</if> 
-<if test="gcId !=null and gcId != ''">
-   and t.gc_id= #{gcId}
-</if> 
-<if test="caId !=null and caId != ''">
-   and t.ca_id= #{caId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
+    <select id="queryMenuGroupCatalogsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from m_menu_group_catalog t
+        where 1 =1
+        <if test="storeType !=null and storeType != ''">
+            and t.store_type= #{storeType}
+        </if>
+        <if test="gId !=null and gId != ''">
+            and t.g_id= #{gId}
+        </if>
+        <if test="gcId !=null and gcId != ''">
+            and t.gc_id= #{gcId}
+        </if>
+        <if test="caId !=null and caId != ''">
+            and t.ca_id= #{caId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0