导入导出

yd-email-feign/src/main/java/com/yd/email/feign/response/ApiImportVariableExcelResponse.java

@@ -9,4 +9,9 @@ public class ApiImportVariableExcelResponse {
      * 当前会话id（前端缓存有值就传，没有值后端生成返回给前端存入前端缓存）
      * 当前会话id（前端缓存有值就传，没有值后端生成返回给前端存入前端缓存）
      */
      */
     private String sessionId;
     private String sessionId;
+
+    /**
+     * 成功导入多少条
+     */
+    private Integer importCount;
 }
 }

yd-email-service/src/main/java/com/yd/email/service/dto/EmailVariableDto.java

@@ -29,6 +29,11 @@ public class EmailVariableDto {
     private String variableNameCn;
     private String variableNameCn;
 
 
     /**
     /**
+     * 变量字段名称中文名列表
+     */
+    private List<String> variableNameCnList;
+
+    /**
      * 变量字段名称英文名
      * 变量字段名称英文名
      */
      */
     private String variableNameEn;
     private String variableNameEn;

yd-email-service/src/main/java/com/yd/email/service/model/EmailContactImport.java

@@ -55,6 +55,12 @@ public class EmailContactImport implements Serializable {
     private String receiveEmail;
     private String receiveEmail;
 
 
     /**
     /**
+     * 收件人名称（姓名或者昵称）
+     */
+    @TableField("receive_name")
+    private String receiveName;
+
+    /**
      * 抄送人邮箱（多个用分号分隔）
      * 抄送人邮箱（多个用分号分隔）
      */
      */
     @TableField("cc_email")
     @TableField("cc_email")

yd-email-service/src/main/java/com/yd/email/service/model/EmailTaskRecipients.java

@@ -49,6 +49,12 @@ public class EmailTaskRecipients implements Serializable {
     private String receiveEmail;
     private String receiveEmail;
 
 
     /**
     /**
+     * 收件人名称（姓名或者昵称）
+     */
+    @TableField("receive_name")
+    private String receiveName;
+
+    /**
      * 抄送人邮箱（多个用分号分隔）
      * 抄送人邮箱（多个用分号分隔）
      */
      */
     @TableField("cc_email")
     @TableField("cc_email")

yd-email-service/src/main/java/com/yd/email/service/service/impl/EmailVariableServiceImpl.java

@@ -46,6 +46,7 @@ public class EmailVariableServiceImpl extends ServiceImpl<EmailVariableMapper, E
                 .eq(StringUtils.isNotBlank(dto.getVariableNameCn()),EmailVariable::getVariableNameCn,dto.getVariableNameCn())
                 .eq(StringUtils.isNotBlank(dto.getVariableNameCn()),EmailVariable::getVariableNameCn,dto.getVariableNameCn())
                 .eq(StringUtils.isNotBlank(dto.getVariableNameEn()),EmailVariable::getVariableNameEn,dto.getVariableNameEn())
                 .eq(StringUtils.isNotBlank(dto.getVariableNameEn()),EmailVariable::getVariableNameEn,dto.getVariableNameEn())
                 .in(!CollectionUtils.isEmpty(dto.getVariableBizIdList()),EmailVariable::getVariableBizId,dto.getVariableBizIdList())
                 .in(!CollectionUtils.isEmpty(dto.getVariableBizIdList()),EmailVariable::getVariableBizId,dto.getVariableBizIdList())
+                .in(!CollectionUtils.isEmpty(dto.getVariableNameCnList()),EmailVariable::getVariableNameCn,dto.getVariableNameCnList())
                 .ne(dto.getIsExcludeMy(),EmailVariable::getVariableBizId,dto.getVariableBizId())
                 .ne(dto.getIsExcludeMy(),EmailVariable::getVariableBizId,dto.getVariableBizId())
         );
         );
         return list;
         return list;