fix: 缺失展示问题修复13526 缺失数据，穿石渝信壹号净值缺失应该是173条， 深国投-尚雅1期没有绘制出规模缺失

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

@@ -53,7 +53,7 @@
     </update>
     <select id="searchDeletionList" resultMap="BaseResultMap"
             parameterType="com.simuwang.base.pojo.dto.query.DeletionPageQuery">
-        SELECT
+        SELECT distinct
         d.fund_id,
         info.fund_name,
         c.company_name,
@@ -63,9 +63,9 @@
         FROM
         PPW_EMAIL.deletion_info d
         LEFT JOIN PPW_EMAIL.pvn_fund_info info
-        ON d.fund_id = info.fund_id
+        ON d.fund_id = info.fund_id and info.isvalid=1
         LEFT JOIN PPW_EMAIL.pvn_company_info c
-        ON info.trust_id = c.company_id
+        ON info.trust_id = c.company_id and c.isvalid=1
         LEFT JOIN
         (SELECT
         di.fund_id,
@@ -93,8 +93,6 @@
         ON ddp.fund_id = d.fund_id
         AND d.deletion_type = ddp.deletion_type
         WHERE d.isvalid = 1
-        AND info.isvalid = 1
-        AND c.isvalid = 1
         <if test="companyName != null and companyName !=''">
             and (c.company_name like concat('%',#{companyName},'%') or c.company_short_name like concat('%',#{companyName},'%'))
         </if>
@@ -115,13 +113,19 @@
     </select>
     <select id="countDeletion" resultType="java.lang.Long"
             parameterType="com.simuwang.base.pojo.dto.query.DeletionPageQuery">
-        select count(1) from (select distinct d.fund_id,d.deletion_type
+        select count(1) from (select distinct
+        d.fund_id,
+        info.fund_name,
+        c.company_name,
+        d.deletion_type,
+        ddn.deletion_num,
+        ddp.processed_num
         FROM
         PPW_EMAIL.deletion_info d
         LEFT JOIN PPW_EMAIL.pvn_fund_info info
-        ON d.fund_id = info.fund_id
+        ON d.fund_id = info.fund_id and info.isvalid=1
         LEFT JOIN PPW_EMAIL.pvn_company_info c
-        ON info.trust_id = c.company_id
+        ON info.trust_id = c.company_id and c.isvalid=1
         LEFT JOIN
         (SELECT
         di.fund_id,
@@ -149,8 +153,6 @@
         ON ddp.fund_id = d.fund_id
         AND d.deletion_type = ddp.deletion_type
         WHERE d.isvalid = 1
-        AND info.isvalid = 1
-        AND c.isvalid = 1
         <if test="companyName != null and companyName !=''">
             and (c.company_name like concat('%',#{companyName},'%') or c.company_short_name like concat('%',#{companyName},'%'))
         </if>