公司邮箱配置增加备注字段

service-base/src/main/java/com/simuwang/base/mapper/CompanyEmailConfigMapper.java

@@ -2,6 +2,7 @@ package com.simuwang.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.simuwang.base.pojo.dos.CompanyEmailConfigDO;
+import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,4 +25,6 @@ public interface CompanyEmailConfigMapper extends BaseMapper<CompanyEmailConfigD
     CompanyEmailConfigDO selectCompanyEmailConfigById(Integer id);
 
     List<String> searchEmailByCompanyId(@Param("companyId")String companyId);
+
+    List<CompanyEmailConfigVO> searchEmailConfig(@Param("companyId") String companyId);
 }

service-base/src/main/java/com/simuwang/base/mapper/CompanyEmailSendHistoryMapper.java

@@ -24,6 +24,4 @@ public interface CompanyEmailSendHistoryMapper {
     void deleteEmailHistory(@Param("emailList")List<String> email);
 
     void deleteEmailHistoryByIds(@Param("ids") String[] split);
-
-    List<CompanyEmailConfigVO> searchEmailConfig(@Param("companyId") String companyId);
 }

service-base/src/main/java/com/simuwang/base/pojo/dos/CompanyEmailConfigDO.java

@@ -43,6 +43,11 @@ public class CompanyEmailConfigDO {
     @TableField(value = "open_status")
     private Integer openStatus;
     /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+    /**
      * 记录的有效性；1-有效；0-无效；
      */
     @TableField(value = "isvalid")

service-base/src/main/java/com/simuwang/base/pojo/vo/CompanyEmailConfigVO.java

@@ -15,7 +15,6 @@ import java.util.Date;
  * Description: ${DESCRIPTION}
  */
 @Data
-@TableName("company_email_config")
 public class CompanyEmailConfigVO {
     /**
      * ID
@@ -37,5 +36,9 @@ public class CompanyEmailConfigVO {
      * 邮箱地址
      */
     private Integer openStatus;
+    /**
+     * 邮箱地址
+     */
+    private String remark;
 
 }

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

@@ -7,6 +7,7 @@
         <if test="companyName != null and companyName != ''">company_name,</if>
         <if test="email != null and email != ''">email,</if>
         <if test="openStatus != null and openStatus != ''">open_status,</if>
+        <if test="remark != null and remark != ''">remark,</if>
         <if test="creatorId != null and creatorId != ''">creatorid,</if>
         <if test="updaterId != null and updaterId != ''">updaterId,</if>
         isvalid,
@@ -17,6 +18,7 @@
         <if test="companyName != null and companyName != ''">#{companyName},</if>
         <if test="email != null and email != ''">#{email},</if>
         <if test="openStatus != null and openStatus != ''">#{openStatus},</if>
+        <if test="remark != null and remark != ''">#{remark},</if>
         <if test="creatorId != null and creatorId != ''">#{creatorId},</if>
         <if test="updaterId != null and updaterId != ''">#{updaterId},</if>
         1,
@@ -32,6 +34,7 @@
             <if test="companyName != null and companyName != ''">company_name=#{companyName},</if>
             <if test="email != null and email != ''">email=#{email},</if>
             <if test="openStatus != null and openStatus != ''">open_status=#{openStatus},</if>
+            <if test="remark != null and remark != ''">remark=#{remark},</if>
             <if test="updaterId != null and updaterId != ''">updaterid=#{updaterId},</if>
             <if test="updateTime != null">updatetime=#{updateTime},</if>
         </set>
@@ -47,6 +50,7 @@
         <result column="company_name" property="companyName"/>
         <result column="email" property="email"/>
         <result column="open_status" property="openStatus"/>
+        <result column="remark" property="remark"/>
         <result column="creatorid" property="creatorId"/>
         <result column="updaterid" property="updaterId"/>
         <result column="createtime" property="createTime"/>
@@ -54,7 +58,7 @@
         <result column="isvalid" property="isvalid"/>
     </resultMap>
     <sql id="selectCompanyEmailConfigDo">
-        select company_id, company_name, email, open_status, creatorid, createtime, updaterid, updatetime,isvalid
+        select company_id, company_name, email, open_status,remark, creatorid, createtime, updaterid, updatetime,isvalid
         from PPW_EMAIL.company_email_config
     </sql>
     <!-- 查询条件 -->
@@ -73,4 +77,19 @@
     <select id="searchEmailByCompanyId" resultType="java.lang.String" parameterType="java.lang.String">
         select email from PPW_EMAIL.company_email_config where company_id = #{companyId} and isvalid =1
     </select>
+
+
+
+    <resultMap id="BaseVOMap" type="com.simuwang.base.pojo.vo.CompanyEmailConfigVO">
+        <id column="id" property="id"/>
+        <result column="company_id" property="companyId"/>
+        <result column="company_name" property="companyName"/>
+        <result column="email" property="email"/>
+        <result column="open_status" property="openStatus"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+    <select id="searchEmailConfig" resultMap="BaseVOMap"
+            parameterType="java.lang.String">
+        select id,company_id,company_name,email,open_status,remark from  PPW_EMAIL.company_email_config where isvalid =1 and company_id=#{companyId}
+    </select>
 </mapper>

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

@@ -71,16 +71,4 @@
             and c.company_id=#{companyId}
         </if>
     </select>
-
-    <resultMap id="BaseVOMap" type="com.simuwang.base.pojo.vo.CompanyEmailConfigVO">
-        <id column="id" property="id"/>
-        <result column="company_id" property="companyId"/>
-        <result column="company_name" property="companyName"/>
-        <result column="email" property="email"/>
-        <result column="open_status" property="openStatus"/>
-    </resultMap>
-    <select id="searchEmailConfig" resultMap="BaseVOMap"
-            parameterType="java.lang.String">
-        select id,company_id,company_name,email,open_status from  PPW_EMAIL.company_email_config where isvalid =1 and company_id=#{companyId}
-    </select>
 </mapper>

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

@@ -54,6 +54,6 @@ public class CompanyEmailSendHistoryServiceImpl implements CompanyEmailSendHisto
 
     @Override
     public List<CompanyEmailConfigVO> searchEmailConfig(String companyId) {
-        return companyEmailSendHistoryMapper.searchEmailConfig(companyId);
+        return companyEmailConfigMapper.searchEmailConfig(companyId);
     }
 }