fix: 批量删除公司邮箱接口调整

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

@@ -18,7 +18,7 @@ import java.util.List;
 @Mapper
 public interface CompanyEmailConfigMapper extends BaseMapper<CompanyEmailConfigDO> {
 
-    void deleteCompanyEmailConfig(@Param("companyId") String companyId);
+    void deleteCompanyEmailConfig(@Param("id") Integer id);
 
     void saveCompanyEmailConfig(CompanyEmailConfigDO emailConfigDO);
 

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

@@ -42,7 +42,7 @@
     </update>
 
     <update id="deleteCompanyEmailConfig">
-        update PPW_EMAIL.company_email_config set isvalid =0 where company_id=#{companyId}
+        update PPW_EMAIL.company_email_config set isvalid =0,updatetime=sysdate() where id=#{id}
     </update>
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.CompanyEmailConfigDO">
         <id column="id" property="id"/>

service-manage/src/main/java/com/simuwang/manage/api/company/CompanyEmailSendHistoryController.java

@@ -65,12 +65,12 @@ public class CompanyEmailSendHistoryController{
 
     /**
      * 根据公司ID批量删除邮箱配置
-     * @param comyanyEmailIdVO
+     * @param idListVO
      * @return
      */
     @PostMapping("delete-company-email")
-    public boolean deleteEmail(@RequestBody CompanyIdListVO comyanyEmailIdVO){
-        companyEmailSendHistoryService.deleteEmail(comyanyEmailIdVO.getCompanyIdList());
+    public boolean deleteEmail(@RequestBody IdListVO idListVO){
+        companyEmailSendHistoryService.deleteEmail(idListVO.getIdList());
         return true;
     }
 

service-manage/src/main/java/com/simuwang/manage/service/CompanyEmailSendHistoryService.java

@@ -19,7 +19,7 @@ public interface CompanyEmailSendHistoryService {
     MybatisPage<CompanyEmailSendHistoryVO> searchCompanyEmail(CompanyEmailPageQuery companyEmailPageQuery);
     MybatisPage<CompanyEmailSendHistoryVO> searchEmailHistory(CompanyEmailHistoryPageQuery companyEmailHistoryPageQuery);
 
-    void deleteEmail(List<String> companyId);
+    void deleteEmail(List<Integer> idList);
 
     void deleteEmailHistory(List<Integer> idList);
 

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

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -50,12 +51,14 @@ public class CompanyEmailSendHistoryServiceImpl implements CompanyEmailSendHisto
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void deleteEmail(List<String> companyIdList) {
-        for(String companyId : companyIdList){
-            List<String> emailList = companyEmailConfigMapper.searchEmailByCompanyId(companyId);
+    public void deleteEmail(List<Integer> idList) {
+        for(Integer id : idList){
+            CompanyEmailConfigDO configDO = companyEmailConfigMapper.selectCompanyEmailConfigById(id);
             //删除配置
-            companyEmailConfigMapper.deleteCompanyEmailConfig(companyId);
+            companyEmailConfigMapper.deleteCompanyEmailConfig(configDO.getId());
             //删除历史
+            List<String> emailList = new ArrayList<>();
+            emailList.add(configDO.getEmail());
             if(emailList.size() > 0){
                 companyEmailSendHistoryMapper.deleteEmailHistory(emailList);
             }