feat(): 数据详情查询接口

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.dto.query.CompanyEmailHistoryPageQuery;
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,6 +17,7 @@ import java.util.List;
  */
 @Mapper
 public interface CompanyEmailConfigMapper extends BaseMapper<CompanyEmailConfigDO> {
+
     void deleteCompanyEmailConfig(@Param("companyId") String companyId);
 
     void saveCompanyEmailConfig(CompanyEmailConfigDO emailConfigDO);
@@ -26,5 +28,9 @@ public interface CompanyEmailConfigMapper extends BaseMapper<CompanyEmailConfigD
 
     List<String> searchEmailByCompanyId(@Param("companyId")String companyId);
 
-    List<CompanyEmailConfigVO> searchEmailConfig(@Param("companyId") String companyId);
+    List<CompanyEmailConfigVO> searchEmailConfig(CompanyEmailHistoryPageQuery companyEmailHistoryPageQuery);
+
+    long countEmailConfig(CompanyEmailHistoryPageQuery companyEmailHistoryPageQuery);
+
+    List<CompanyEmailConfigVO> searchEmailConfigByCompanyId(@Param("companyId")String companyId);
 }

service-base/src/main/java/com/simuwang/base/pojo/dto/query/FundFilePageQuery.java

@@ -15,7 +15,7 @@ public class FundFilePageQuery extends PageQuery {
      */
     private String fundId;
     /**
-     * 文件类型
+     * 文件类型,1-净值，2-估值，3-报告
      */
     private String fileType;
 

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

@@ -78,8 +78,6 @@
         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"/>
@@ -88,8 +86,16 @@
         <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 id="searchEmailConfig" resultMap="BaseVOMap">
+        select id,company_id,company_name,email,open_status,remark from
+         PPW_EMAIL.company_email_config where isvalid =1 and company_id=#{companyId}
+        limit #{offset},#{pageSize}
+    </select>
+    <select id="countEmailConfig" resultType="java.lang.Long" parameterType="java.lang.String">
+        select count(1) from PPW_EMAIL.company_email_config where isvalid =1 and company_id=#{companyId}
+    </select>
+    <select id="searchEmailConfigByCompanyId" resultMap="BaseVOMap">
+        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-manage/src/main/java/com/simuwang/manage/api/company/CompanyEmailSendHistoryController.java

@@ -56,26 +56,27 @@ public class CompanyEmailSendHistoryController extends BaseController {
 
 
     /**
-     * 查询邮箱配置信息
-     * @param companyId 公司ID
+     * 根据公司ID查询邮箱配置信息
+     * @param companyEmailHistoryPageQuery 公司ID
      * @return
      */
     @RequestMapping("search-email-config")
-    public TableDataInfo searchEmailConfig(@RequestParam(value = "companyId",required = false)String companyId){
-        List<CompanyEmailConfigVO> result = companyEmailSendHistoryService.searchEmailConfig(companyId);
-        return getDataTable(result);
+    public MybatisPage<CompanyEmailConfigVO> searchEmailConfig(CompanyEmailHistoryPageQuery companyEmailHistoryPageQuery){
+        MybatisPage<CompanyEmailConfigVO> result = companyEmailSendHistoryService.searchEmailConfig(companyEmailHistoryPageQuery);
+        return result;
     }
 
     /**
-     * 根据公司ID删除邮箱配置
+     * 根据公司ID批量删除邮箱配置
      * @param comyanyEmailIdVO
      * @return
      */
     @PostMapping("delete-company-email")
     public boolean deleteEmail(@RequestBody IdVO comyanyEmailIdVO){
-        companyEmailSendHistoryService.deleteEmail(comyanyEmailIdVO.getCompanyId());
+        companyEmailSendHistoryService.deleteEmail(comyanyEmailIdVO.getCompanyIdList());
         return true;
     }
+
     /**
      * 根据ID批量删除邮箱发送历史数据
      * @param comyanyEmailIdVO 已选行的idList

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

@@ -18,9 +18,9 @@ public interface CompanyEmailSendHistoryService {
     MybatisPage<CompanyEmailSendHistoryVO> searchCompanyEmail(CompanyEmailPageQuery companyEmailPageQuery);
     MybatisPage<CompanyEmailSendHistoryVO> searchEmailHistory(CompanyEmailHistoryPageQuery companyEmailHistoryPageQuery);
 
-    void deleteEmail(String email);
+    void deleteEmail(List<String> companyId);
 
     void deleteEmailHistory(List<Integer> idList);
 
-    List<CompanyEmailConfigVO> searchEmailConfig(String companyId);
+    MybatisPage<CompanyEmailConfigVO> searchEmailConfig(CompanyEmailHistoryPageQuery companyEmailHistoryPageQuery);
 }

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

@@ -71,7 +71,7 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
     @Override
     public void sendCompanyEmail(List<String> companyIdList) {
         for(String companyId : companyIdList){
-            List<CompanyEmailConfigVO> configVOs = companyEmailConfigMapper.searchEmailConfig(companyId);
+            List<CompanyEmailConfigVO> configVOs = companyEmailConfigMapper.searchEmailConfigByCompanyId(companyId);
             if(configVOs .size() > 0){
                 List<String> emailList = new ArrayList<>();
                 for(CompanyEmailConfigVO configVO : configVOs){

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

@@ -48,13 +48,15 @@ public class CompanyEmailSendHistoryServiceImpl implements CompanyEmailSendHisto
 
     @Override
     @Transactional
-    public void deleteEmail(String companyId) {
-        List<String> emailList = companyEmailConfigMapper.searchEmailByCompanyId(companyId);
-        //删除配置
-        companyEmailConfigMapper.deleteCompanyEmailConfig(companyId);
-        //删除历史
-        if(emailList.size() > 0){
-            companyEmailSendHistoryMapper.deleteEmailHistory(emailList);
+    public void deleteEmail(List<String> companyIdList) {
+        for(String companyId : companyIdList){
+            List<String> emailList = companyEmailConfigMapper.searchEmailByCompanyId(companyId);
+            //删除配置
+            companyEmailConfigMapper.deleteCompanyEmailConfig(companyId);
+            //删除历史
+            if(emailList.size() > 0){
+                companyEmailSendHistoryMapper.deleteEmailHistory(emailList);
+            }
         }
     }
 
@@ -64,7 +66,9 @@ public class CompanyEmailSendHistoryServiceImpl implements CompanyEmailSendHisto
     }
 
     @Override
-    public List<CompanyEmailConfigVO> searchEmailConfig(String companyId) {
-        return companyEmailConfigMapper.searchEmailConfig(companyId);
+    public MybatisPage<CompanyEmailConfigVO> searchEmailConfig(CompanyEmailHistoryPageQuery companyEmailHistoryPageQuery) {
+        List<CompanyEmailConfigVO> emailList = companyEmailConfigMapper.searchEmailConfig(companyEmailHistoryPageQuery);
+        long total = companyEmailConfigMapper.countEmailConfig(companyEmailHistoryPageQuery);
+        return MybatisPage.of(total,emailList);
     }
 }

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

@@ -30,6 +30,7 @@ public class FundReportFrequencyServiceImpl implements FundReportFrequencyServic
             fundReportFrequencyDO.setAssetFrequency(fundReportFrequency.getAssetFrequency());
             fundReportFrequencyDO.setNavFrequency(fundReportFrequency.getNavFrequency());
             fundReportFrequencyDO.setUpdateTime(new Date());
+            fundReportFrequencyDO.setFrequencyRemark(fundReportFrequency.getFrequencyRemark());
             FundReportFrequencyDO oldFrequency = fundReportFrequencyMapper.getFrequencyByFundId(fundId);
             if(oldFrequency == null){
                 fundReportFrequencyDO.setCreateTime(new Date());