From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/java/com/nanometer/smartlab/dao/BaseMetaDao.xml |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/BaseMetaDao.xml b/src/main/java/com/nanometer/smartlab/dao/BaseMetaDao.xml
index 954cc8c..ee7ddff 100644
--- a/src/main/java/com/nanometer/smartlab/dao/BaseMetaDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/BaseMetaDao.xml
@@ -11,11 +11,12 @@
     <result property="createTime" column="create_time"></result>
     <result property="updateTime" column="update_time"></result>
     <result property="validFlag" column="valid_flag" typeHandler="com.nanometer.smartlab.entity.handler.ValidFlagHandler"></result>
+    <result property="groupCode" column="group_code"></result>
   </resultMap>
 
   <sql id="queryWhereSql">
-    <if test="groupId != null and groupId != ''">
-      and group_id = #{groupId}
+    <if test="groupCode != null and groupCode != ''">
+      and group_code = #{groupCode}
     </if>
     <if test="keyword != null and keyword != ''">
       and (meta_key like #{keyword} or meta_value like #{keyword})
@@ -31,7 +32,7 @@
     </if>
   </sql>
 
-  <select id="getBaseMeta" parameterType="java.lang.String"  resultMap="BaseMeta" >
+  <select id="getBaseMeta"  resultMap="BaseMeta" >
     select * from base_meta
     where id = #{id} and valid_flag = 1
   </select>
@@ -45,7 +46,7 @@
     select * from base_meta
     where valid_flag = 1
     <include refid="queryWhereSql"/>
-    order by group_id asc,meta_value desc, order_index asc
+    order by group_code asc,meta_value desc, order_index asc
     <if test="first != null and pageSize != null">
       limit #{first}, #{pageSize}
     </if>
@@ -59,8 +60,8 @@
       select * from  base_meta
       where
       valid_flag = 1
-      <if test="groupId != null and groupId != ''">
-       and group_id = #{groupId}
+      <if test="groupCode != null and groupCode != ''">
+       and group_code = #{groupCode}
       </if>
       <if test="key != null and key != ''">
         and meta_key = #{key}
@@ -71,9 +72,9 @@
       limit 1
     </select>
 
-    <insert id="insertBaseMeta" parameterType="com.nanometer.smartlab.entity.BaseMeta">
-    insert into base_meta(id, group_id, meta_key, meta_value, order_index, memo, create_time, update_time, valid_flag)
-    values (#{id}, #{groupId}, #{metaKey}, #{metaValue}, #{orderIndex}, #{memo}, now(), now(), 1)
+    <insert id="insertBaseMeta" parameterType="com.nanometer.smartlab.entity.BaseMeta" useGeneratedKeys = "true" keyProperty = "id">
+    insert into base_meta(group_code, meta_key, meta_value, order_index, memo, create_time, update_time, valid_flag)
+    values (#{groupCode}, #{metaKey}, #{metaValue}, #{orderIndex}, #{memo}, now(), now(), 1)
   </insert>
   <update id="updateBaseMeta" parameterType="com.nanometer.smartlab.entity.BaseMeta">
     update base_meta set group_id=#{groupId}, meta_key=#{metaKey}, meta_value=#{metaValue}, order_index=#{orderIndex},
@@ -81,7 +82,7 @@
     where id=#{id}
   </update>
 
-  <update id="deleteBaseMeta" parameterType="java.lang.String">
+  <update id="deleteBaseMeta">
     update base_meta set valid_flag=0, update_time=now()
     where id=#{id}
   </update>

--
Gitblit v1.9.2