Преглед на файлове

feat: 模版保存处理字段大小写

chenjianhua преди 7 месеца
родител
ревизия
488bcda3a7

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

@@ -16,7 +16,7 @@
         <result column="updatetime" property="updateTime"/>
     </resultMap>
     <insert id="batchInsert">
-        insert into PPW_EMAIL.email_template_application_rule(template_id,type,row,column,contain_keyword,not_contain_keyword,isvalid,creatorid,createtime,updaterid,updatetime)
+        insert into PPW_EMAIL.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},

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

@@ -17,7 +17,7 @@
         <result column="updatetime" property="updateTime"/>
     </resultMap>
     <insert id="batchInsert">
-        insert into PPW_EMAIL.email_template_data_rule(template_id,field_name,position,row,column,field_rule,unit_convert,isvalid,creatorid,createtime,updaterid,updatetime)
+        insert into PPW_EMAIL.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},

+ 2 - 1
service-manage/src/main/java/com/simuwang/manage/service/impl/EmailTemplateInfoServiceImpl.java

@@ -62,7 +62,8 @@ public class EmailTemplateInfoServiceImpl implements EmailTemplateInfoService {
         Integer templateId;
         if(StringUtil.isNull(emailDeletionInfoDO.getId())){
             //保存
-            templateId = emailTemplateInfoMapper.saveTemplateInfo(emailDeletionInfoDO);
+            emailTemplateInfoMapper.saveTemplateInfo(emailDeletionInfoDO);
+            templateId = emailDeletionInfoDO.getId();
             List<EmailTemplateDataRuleVO> emailTemplateDataRuleVOList = saveTemplateInfoVO.getEmailTemplateDataRuleVOList();
             if(emailTemplateDataRuleVOList.size() > 0){
                 emailTemplateDataRuleVOList.forEach(e -> e.setTemplateId(templateId));