浏览代码

fix: 模版配置查询接口报错修复

chenjianhua 7 月之前
父节点
当前提交
b8b84e8b26

+ 0 - 1
service-base/src/main/java/com/simuwang/base/pojo/dos/EmailTemplateMappingDO.java

@@ -83,7 +83,6 @@ public class EmailTemplateMappingDO {
         vo.setId(this.id);
         vo.setId(this.id);
         vo.setCompanyName(this.companyName);
         vo.setCompanyName(this.companyName);
         vo.setTitle(this.title);
         vo.setTitle(this.title);
-        vo.setDescription(this.description);
         vo.setTemplateName(this.templateName);
         vo.setTemplateName(this.templateName);
         vo.setStatus(this.status);
         vo.setStatus(this.status);
         vo.setEmail(this.email);
         vo.setEmail(this.email);

+ 0 - 4
service-base/src/main/java/com/simuwang/base/pojo/vo/EmailTemplateMappingVO.java

@@ -34,10 +34,6 @@ public class EmailTemplateMappingVO {
      */
      */
     private String companyName;
     private String companyName;
     /**
     /**
-     * 备注
-     */
-    private String description;
-    /**
      * 状态:0-关闭,1-开启
      * 状态:0-关闭,1-开启
      */
      */
     private Integer status;
     private Integer status;

+ 5 - 6
service-base/src/main/resources/mapper/EmailTemplateMappingMapper.xml

@@ -7,7 +7,6 @@
         <result column="title" property="title"/>
         <result column="title" property="title"/>
         <result column="email" property="email"/>
         <result column="email" property="email"/>
         <result column="company_name" property="companyName"/>
         <result column="company_name" property="companyName"/>
-        <result column="description" property="description"/>
         <result column="status" property="status"/>
         <result column="status" property="status"/>
         <result column="isvalid" property="isvalid"/>
         <result column="isvalid" property="isvalid"/>
         <result column="creatorid" property="creatorId"/>
         <result column="creatorid" property="creatorId"/>
@@ -17,9 +16,9 @@
         <result column="template_name" property="templateName"/>
         <result column="template_name" property="templateName"/>
     </resultMap>
     </resultMap>
     <insert id="saveEmailTemplateMappingDO">
     <insert id="saveEmailTemplateMappingDO">
-        insert into PPW_EMAIL.email_template_mapping(template_id,title,email,company_name,description,status,isvalid,creatorid,createtime,updaterid,updatetime)
+        insert into PPW_EMAIL.email_template_mapping(template_id,title,email,company_name,status,isvalid,creatorid,createtime,updaterid,updatetime)
         values
         values
-            (#{templateId},#{title},#{email},#{companyName},#{description},#{status},#{isvalid},#{creatorId},#{createTime},#{updaterId},#{updateTime})
+            (#{templateId},#{title},#{email},#{companyName},#{status},#{isvalid},#{creatorId},#{createTime},#{updaterId},#{updateTime})
     </insert>
     </insert>
     <update id="deleteTemplateSetting">
     <update id="deleteTemplateSetting">
         update  PPW_EMAIL.email_template_mapping set isvalid=0,updatetime=sysdate(),updaterid=#{userId}
         update  PPW_EMAIL.email_template_mapping set isvalid=0,updatetime=sysdate(),updaterid=#{userId}
@@ -30,7 +29,7 @@
     </update>
     </update>
     <update id="updateEmailTemplateMappingDO">
     <update id="updateEmailTemplateMappingDO">
         update PPW_EMAIL.email_template_mapping set template_id=#{templateId},title=#{title},email=#{email},company_name=#{companyName},
         update PPW_EMAIL.email_template_mapping set template_id=#{templateId},title=#{title},email=#{email},company_name=#{companyName},
-                                                    description=#{description}, status=#{status},updatetime=#{updateTime},updaterid=#{updaterId}
+                                                    status=#{status},updatetime=#{updateTime},updaterid=#{updaterId}
         where isvalid=1 and id=#{id}
         where isvalid=1 and id=#{id}
     </update>
     </update>
 
 
@@ -48,7 +47,7 @@
           and t2.status = 1
           and t2.status = 1
     </select>
     </select>
     <select id="searchTemplateSettingList" resultMap="BaseResultMap">
     <select id="searchTemplateSettingList" resultMap="BaseResultMap">
-        select mapping.id,mapping.template_id,mapping.title,mapping.email,mapping.company_name,mapping.description,mapping.status,
+        select mapping.id,mapping.template_id,mapping.title,mapping.email,mapping.company_name,mapping.status,
         t.name as template_name
         t.name as template_name
         from PPW_EMAIL.email_template_mapping mapping
         from PPW_EMAIL.email_template_mapping mapping
             join PPW_EMAIL.email_template_info t on t.id = mapping.template_id and t.isvalid = 1 and t.status = 1
             join PPW_EMAIL.email_template_info t on t.id = mapping.template_id and t.isvalid = 1 and t.status = 1
@@ -74,7 +73,7 @@
         select count(mapping.id)
         select count(mapping.id)
         from PPW_EMAIL.email_template_mapping mapping
         from PPW_EMAIL.email_template_mapping mapping
         join PPW_EMAIL.email_template_info t on t.id = mapping.template_id and t.isvalid = 1 and t.status = 1
         join PPW_EMAIL.email_template_info t on t.id = mapping.template_id and t.isvalid = 1 and t.status = 1
-        where mapping,isvalid=1
+        where mapping.isvalid=1
         <if test="title != null and title != ''">
         <if test="title != null and title != ''">
             mapping.title like concat('%',#{title},'%')
             mapping.title like concat('%',#{title},'%')
         </if>
         </if>