fix: 关键字处理

service-base/src/main/resources/mapper/EmailTemplateApplicationRuleMapper.xml

@@ -4,9 +4,9 @@
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.EmailTemplateApplicationRuleDO">
         <id column="id" property="id"/>
         <result column="template_id" property="templateId"/>
-        <result column="TYPE" property="type"/>
-        <result column="ROW" property="row"/>
-        <result column="COLUMN" property="column"/>
+        <result column="type" property="type"/>
+        <result column="row" property="row"/>
+        <result column="column" property="column"/>
         <result column="contain_keyword" property="containKeyword"/>
         <result column="not_contain_keyword" property="notContainKeyword"/>
         <result column="isvalid" property="isvalid"/>
@@ -16,7 +16,7 @@
         <result column="updatetime" property="updateTime"/>
     </resultMap>
     <insert id="batchInsert">
-        insert into email_template_application_rule(template_id,"TYPE","ROW","COLUMN",contain_keyword,not_contain_keyword,isvalid,creatorid,createtime,updaterid,updatetime)
+        insert into email_template_application_rule(template_id,type,`row`,`column`,contain_keyword,not_contain_keyword,isvalid,creatorid,createtime,updaterid,updatetime)
         values
         <foreach collection="itemDoList" item="itemDo" index="index" separator=",">
             (#{itemDo.templateId},#{itemDo.type},#{itemDo.row},#{itemDo.column},#{itemDo.containKeyword},#{itemDo.notContainKeyword},
@@ -28,9 +28,9 @@
             update email_template_application_rule
             <set>
                 template_id=#{itemDo.templateId},
-                "TYPE" = #{itemDo.type},
-                "ROW"=#{itemDo.row},
-                "COLUMN"=#{itemDo.column},
+                type = #{itemDo.type},
+                `row`=#{itemDo.row},
+                `column`=#{itemDo.column},
                 contain_keyword=#{itemDo.containKeyword},
                 not_contain_keyword=#{itemDo.notContainKeyword},
                 updatetime=#{itemDo.updateTime},

service-base/src/main/resources/mapper/EmailTemplateDataRuleMapper.xml

@@ -6,8 +6,8 @@
         <result column="template_id" property="templateId"/>
         <result column="field_name" property="fieldName"/>
         <result column="position" property="position"/>
-        <result column="ROW" property="row"/>
-        <result column="COLUMN" property="column"/>
+        <result column="row" property="row"/>
+        <result column="column" property="column"/>
         <result column="field_rule" property="fieldRule"/>
         <result column="unit_convert" property="unitConvert"/>
         <result column="isvalid" property="isvalid"/>
@@ -17,7 +17,7 @@
         <result column="updatetime" property="updateTime"/>
     </resultMap>
     <insert id="batchInsert">
-        insert into email_template_data_rule(template_id,field_name,position,"ROW","COLUMN",field_rule,unit_convert,isvalid,creatorid,createtime,updaterid,updatetime)
+        insert into email_template_data_rule(template_id,field_name,position,`row`,`column`,field_rule,unit_convert,isvalid,creatorid,createtime,updaterid,updatetime)
         values
         <foreach collection="itemDoList" item="itemDo" index="index" separator=",">
             (#{itemDo.templateId},#{itemDo.fieldName},#{itemDo.position},#{itemDo.row},#{itemDo.column},#{itemDo.fieldRule},#{itemDo.unitConvert},
@@ -31,8 +31,8 @@
                 template_id = #{itemDo.templateId},
                 field_name = #{itemDo.fieldName},
                 position = #{itemDo.position},
-                "ROW" = #{itemDo.row},
-                "COLUMN" = #{itemDo.column},
+                `row` = #{itemDo.row},
+                `column` = #{itemDo.column},
                 field_rule = #{itemDo.fieldRule},
                 unit_convert = #{itemDo.unitConvert},
                 updatetime = #{itemDo.updateTime},

service-base/src/main/resources/mapper/EmailTemplateInfoMapper.xml

@@ -4,7 +4,7 @@
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.EmailTemplateInfoDO">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
-        <result column="TYPE" property="type"/>
+        <result column="type" property="type"/>
         <result column="direction" property="direction"/>
         <result column="start_index" property="startIndex"/>
         <result column="end_index" property="endIndex"/>
@@ -17,7 +17,7 @@
         <result column="updatetime" property="updateTime"/>
     </resultMap>
     <insert id="saveTemplateInfo"  useGeneratedKeys="true" keyProperty="id">
-        insert into email_template_info(name,"TYPE",direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime)
+        insert into email_template_info(name,type,direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime)
         values
             (#{name},#{type},#{direction},#{startIndex},#{endIndex},#{description},#{status},#{isvalid},#{creatorId},#{createTime},#{updaterId},#{updateTime})
     </insert>
@@ -29,11 +29,11 @@
         </foreach>
     </update>
     <update id="updateTemplateInfo">
-        update email_template_info set name=#{name},"TYPE"=#{type},direction=#{direction},description=#{description},status=#{status},updatetime=#{updateTime},updaterid=#{updaterId}
+        update email_template_info set name=#{name},type=#{type},direction=#{direction},description=#{description},status=#{status},updatetime=#{updateTime},updaterid=#{updaterId}
         where id=#{id} and isvalid=1
     </update>
     <select id="searchTemplateList" resultMap="BaseResultMap">
-        select id,name,"TYPE",direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime
+        select id,name,type,direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime
         from email_template_info where isvalid=1
         <if test="name != null and name !=''">
             and name like concat('%',#{name},'%')
@@ -67,11 +67,11 @@
         </if>
     </select>
     <select id="searchTemplateById" resultMap="BaseResultMap">
-        select id,name,"TYPE",direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime
+        select id,name,type,direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime
         from email_template_info where isvalid=1 and id=#{id}
     </select>
     <select id="searchTemplateByName" resultType="com.simuwang.base.pojo.dos.EmailTemplateInfoDO">
-        select id,name,"TYPE",direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime
+        select id,name,type,direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime
         from email_template_info where isvalid=1 and name=#{name} limit 1
     </select>