feat: 模版保存

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

@@ -28,9 +28,9 @@
             update PPW_EMAIL.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

@@ -28,15 +28,15 @@
         <foreach collection="itemDoList" item="itemDo" index="index" open="" close="" separator=";">
             update PPW_EMAIL.email_template_data_rule
             <set>
-                template_id=#{itemDo.templateId},
+                template_id = #{itemDo.templateId},
                 field_name = #{itemDo.fieldName},
-                position=#{itemDo.position},
-                row=#{itemDo.row},
-                column=#{itemDo.column},
-                field_rule=#{itemDo.fieldRule},
-                unit_convert=#{itemDo.unitConvert},
-                updatetime=#{itemDo.updateTime},
-                updaterid=#{itemDo.updaterId}
+                `POSITION` = #{itemDo.position},
+                `ROW` = #{itemDo.row},
+                `COLUMN` = #{itemDo.column},
+                field_rule = #{itemDo.fieldRule},
+                unit_convert = #{itemDo.unitConvert},
+                updatetime = #{itemDo.updateTime},
+                updaterid = #{itemDo.updaterId}
             </set>
             where isvalid = 1 and id=#{itemDo.id}
         </foreach>

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

@@ -96,14 +96,14 @@ public class EmailTemplateInfoServiceImpl implements EmailTemplateInfoService {
                     if(StringUtil.isNull(emailTemplateDataRuleDO.getId())){
                         addList.add(emailTemplateDataRuleDO);
                     }else{
-                        addList.add(emailTemplateDataRuleDO);
+                        editList.add(emailTemplateDataRuleDO);
                     }
                 }
                 if(addList.size() > 0){
                     emailTemplateDataRuleMapper.batchInsert(addList);
                 }
                 if(editList.size() > 0){
-                    emailTemplateDataRuleMapper.batchUpdate(editList);
+                    emailTemplateDataRuleMapper.batchUpdate(editList.subList(0,1));
                 }
             }
             List<EmailTemplateApplicationRuleVO> emailTemplateApplicationRuleVOList = saveTemplateInfoVO.getEmailTemplateApplicationRuleVOList();
@@ -192,6 +192,7 @@ public class EmailTemplateInfoServiceImpl implements EmailTemplateInfoService {
         emailTemplateDataRuleDO.setRow(dataRuleVO.getRow());
         emailTemplateDataRuleDO.setPosition(dataRuleVO.getPosition());
         emailTemplateDataRuleDO.setUnitConvert(dataRuleVO.getUnitConvert());
+        emailTemplateDataRuleDO.setFieldName(dataRuleVO.getFieldName());
         emailTemplateDataRuleDO.setIsvalid(1);
         emailTemplateDataRuleDO.setUpdaterId(userId);
         emailTemplateDataRuleDO.setUpdateTime(DateUtils.getNowDate());
@@ -208,7 +209,11 @@ public class EmailTemplateInfoServiceImpl implements EmailTemplateInfoService {
         emailDeletionInfoDO.setId(emailTemplateInfoVO.getId());
         emailDeletionInfoDO.setName(emailTemplateInfoVO.getName());
         emailDeletionInfoDO.setStatus(emailTemplateInfoVO.getStatus());
+        emailDeletionInfoDO.setDirection(emailTemplateInfoVO.getDirection());
+        emailDeletionInfoDO.setStartIndex(emailTemplateInfoVO.getStartIndex());
+        emailDeletionInfoDO.setEndIndex(emailTemplateInfoVO.getEndIndex());
         emailDeletionInfoDO.setDescription(emailTemplateInfoVO.getDescription());
+        emailDeletionInfoDO.setType(emailTemplateInfoVO.getType());
         emailDeletionInfoDO.setIsvalid(1);
         emailDeletionInfoDO.setUpdateTime(DateUtils.getNowDate());
         emailDeletionInfoDO.setUpdaterId(userId);