fix: 公司邮箱编辑接口调整

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
 import lombok.Data;
 
 import java.util.Date;
@@ -72,4 +73,15 @@ public class CompanyEmailConfigDO {
      */
     @TableField(value = "updatetime")
     private Date updateTime;
+
+    public CompanyEmailConfigVO toVO() {
+        CompanyEmailConfigVO vo = new CompanyEmailConfigVO();
+        vo.setEmail(this.getEmail());
+        vo.setCompanyId(this.getCompanyId());
+        vo.setOpenStatus(this.getOpenStatus());
+        vo.setSendRemark(this.getRemark());
+        vo.setCompanyName(this.getCompanyName());
+        vo.setId(this.getId());
+        return vo;
+    }
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.simuwang.base.common.util.DateUtils;
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
 import com.simuwang.base.pojo.vo.CompanyEmailSendHistoryVO;
 import lombok.Data;
@@ -41,7 +42,7 @@ public class CompanyEmailSendHistoryDO {
     /**
      * 发送时间
      */
-    private String sendTime;
+    private Date sendTime;
     /**
      * 发送备注
      */
@@ -75,7 +76,7 @@ public class CompanyEmailSendHistoryDO {
         vo.setSendRemark(this.getSendRemark());
         vo.setSendStatus(this.getSendStatus());
         vo.setCompanyName(this.getCompanyName());
-        vo.setSendTime(this.getSendTime());
+        vo.setSendTime(this.getSendTime()==null?null: DateUtils.format(this.getSendTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
         return vo;
     }
 }

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

@@ -58,7 +58,7 @@
         <result column="isvalid" property="isvalid"/>
     </resultMap>
     <sql id="selectCompanyEmailConfigDo">
-        select company_id, company_name, email, open_status,remark, creatorid, createtime, updaterid, updatetime,isvalid
+        select id,company_id, company_name, email, open_status,remark, creatorid, createtime, updaterid, updatetime,isvalid
         from PPW_EMAIL.company_email_config
     </sql>
     <!-- 查询条件 -->

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

@@ -7,6 +7,7 @@ import com.simuwang.base.pojo.dto.query.CompanyEmailPageQuery;
 import com.simuwang.base.pojo.vo.*;
 import com.simuwang.manage.service.CompanyEmailConfigService;
 import com.simuwang.manage.service.CompanyEmailSendHistoryService;
+import com.smppw.common.pojo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,13 +54,13 @@ public class CompanyEmailSendHistoryController{
 
     /**
      * 根据公司ID查询邮箱配置信息
-     * @param companyEmailHistoryPageQuery 公司ID
+     * @param idVO
      * @return
      */
     @RequestMapping("search-email-config")
-    public MybatisPage<CompanyEmailConfigVO> searchEmailConfig(CompanyEmailHistoryPageQuery companyEmailHistoryPageQuery){
-        MybatisPage<CompanyEmailConfigVO> result = companyEmailSendHistoryService.searchEmailConfig(companyEmailHistoryPageQuery);
-        return result;
+    public ResultVo<CompanyEmailConfigVO> searchEmailConfig(IdVO idVO){
+        CompanyEmailConfigVO configVO = companyEmailSendHistoryService.searchEmailConfig(idVO);
+        return ResultVo.ok(configVO);
     }
 
     /**

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

@@ -5,6 +5,7 @@ import com.simuwang.base.pojo.dto.query.CompanyEmailHistoryPageQuery;
 import com.simuwang.base.pojo.dto.query.CompanyEmailPageQuery;
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
 import com.simuwang.base.pojo.vo.CompanyEmailSendHistoryVO;
+import com.simuwang.base.pojo.vo.IdVO;
 
 import java.util.List;
 
@@ -22,5 +23,5 @@ public interface CompanyEmailSendHistoryService {
 
     void deleteEmailHistory(List<Integer> idList);
 
-    MybatisPage<CompanyEmailConfigVO> searchEmailConfig(CompanyEmailHistoryPageQuery companyEmailHistoryPageQuery);
+    CompanyEmailConfigVO searchEmailConfig(IdVO idVO);
 }

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

@@ -3,12 +3,14 @@ package com.simuwang.manage.service.impl;
 import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.mapper.CompanyEmailConfigMapper;
 import com.simuwang.base.mapper.CompanyEmailSendHistoryMapper;
+import com.simuwang.base.pojo.dos.CompanyEmailConfigDO;
 import com.simuwang.base.pojo.dos.CompanyEmailSendHistoryDO;
 import com.simuwang.base.pojo.dos.sys.SysRoleUserDO;
 import com.simuwang.base.pojo.dto.query.CompanyEmailHistoryPageQuery;
 import com.simuwang.base.pojo.dto.query.CompanyEmailPageQuery;
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
 import com.simuwang.base.pojo.vo.CompanyEmailSendHistoryVO;
+import com.simuwang.base.pojo.vo.IdVO;
 import com.simuwang.manage.service.CompanyEmailSendHistoryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -66,9 +68,9 @@ public class CompanyEmailSendHistoryServiceImpl implements CompanyEmailSendHisto
     }
 
     @Override
-    public MybatisPage<CompanyEmailConfigVO> searchEmailConfig(CompanyEmailHistoryPageQuery companyEmailHistoryPageQuery) {
-        List<CompanyEmailConfigVO> emailList = companyEmailConfigMapper.searchEmailConfig(companyEmailHistoryPageQuery);
-        long total = companyEmailConfigMapper.countEmailConfig(companyEmailHistoryPageQuery);
-        return MybatisPage.of(total,emailList);
+    public CompanyEmailConfigVO searchEmailConfig(IdVO idVO) {
+        CompanyEmailConfigDO configDO = companyEmailConfigMapper.selectCompanyEmailConfigById(idVO.getId());
+        CompanyEmailConfigVO configVO = configDO.toVO();
+        return configVO;
     }
 }