fix: 基金缺失明细查询调整

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

@@ -24,6 +24,10 @@ public class FundDeletionInfoDO {
      */
     private String fundId;
     /**
+     * 基金名称
+     */
+    private String fundName;
+    /**
      * 缺失类型
      */
     private Integer deletionType;
@@ -64,6 +68,7 @@ public class FundDeletionInfoDO {
         deletionInfoVO.setDeletionType(this.deletionType);
         deletionInfoVO.setDeletionDate(this.deletionDate);
         deletionInfoVO.setRemark(this.remark);
+        deletionInfoVO.setFundName(this.fundName);
         return deletionInfoVO;
     }
 }

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

@@ -186,6 +186,7 @@
     <resultMap id="BaseMap" type="com.simuwang.base.pojo.dos.FundDeletionInfoDO">
         <id column="id" property="id"/>
         <result column="fund_id" property="fundId"/>
+        <result column="fund_name" property="fundName"/>
         <result column="deletion_date" property="deletionDate"/>
         <result column="deletion_type" property="deletionType"/>
         <result column="remark" property="remark"/>
@@ -197,15 +198,39 @@
     </resultMap>
     <select id="searchFundDeletionList" resultMap="BaseMap"
             parameterType="com.simuwang.base.pojo.dto.query.FundDeletionPageQuery">
-        select id,fund_id,deletion_type,deletion_date,remark,isvalid,creatorid,updaterid,createtime,updatetime
-        from PPW_EMAIL.deletion_info where isvalid=1 and fund_id=#{fundId} and deletion_type=#{deletionType}
-        order by deletion_date desc
+        SELECT
+            d.id,
+            d.fund_id,
+            info.fund_name,
+            d.deletion_type,
+            d.deletion_date,
+            d.remark,
+            d.isvalid,
+            d.creatorid,
+            d.updaterid,
+            d.createtime,
+            d.updatetime
+        FROM
+            PPW_EMAIL.deletion_info d
+        left join PPW_EMAIL.pvn_fund_info info
+        on d.fund_id =info.fund_id and info.isvalid=1
+        WHERE d.isvalid = 1
+          AND d.fund_id = #{fundId}
+          AND d.deletion_type = #{deletionType}
+        ORDER BY deletion_date DESC
         limit #{offset},#{pageSize}
     </select>
     <select id="countFundDeletionList" resultType="java.lang.Long"
             parameterType="com.simuwang.base.pojo.dto.query.FundDeletionPageQuery">
-        select count(1)
-            from PPW_EMAIL.deletion_info where isvalid=1 and fund_id=#{fundId} and deletion_type=#{deletionType}
+        select count(d.id)
+        FROM
+            PPW_EMAIL.deletion_info d
+                left join PPW_EMAIL.pvn_fund_info info
+                          on d.fund_id =info.fund_id and info.isvalid=1
+        WHERE d.isvalid = 1
+          AND d.fund_id = #{fundId}
+          AND d.deletion_type = #{deletionType}
+        ORDER BY deletion_date DESC
     </select>
     <select id="selectFundDeletionInfoVOList" resultType="com.simuwang.base.pojo.dos.FundDeletionInfoDO"
             parameterType="java.util.List">

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

@@ -70,9 +70,6 @@ public class DeletionServiceImpl implements DeletionService {
         List<FundDeletionInfoDO> deletionInfoDOList = deletionInfoMapper.searchFundDeletionList(fundDeletionPageQuery);
         long total = deletionInfoMapper.countFundDeletionList(fundDeletionPageQuery);
         List<FundDeletionInfoVO> dataList = deletionInfoDOList.stream().map(FundDeletionInfoDO::toVO).collect(Collectors.toList());
-        for(FundDeletionInfoVO infoVO : dataList){
-            infoVO.setFundName(fundInfoMapper.getFundNameByFundId(infoVO.getFundId()));
-        }
         return MybatisPage.of(total,dataList);
     }