fix:数据详情优化查询

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

@@ -66,8 +66,6 @@
         on asset.file_id = file.id
         join PPW_EMAIL.email_parse_info parse
         on file.email_id = parse.id
-        left join PPW_EMAIL.pvn_fund_info info
-        on asset.fund_id=info.fund_id and info.isvalid=1
         where asset.isvalid=1 and file.isvalid=1 and parse.isvalid=1
         <if test="fundName != null and fundName !=''">
             and (asset.fund_name like concat('%',#{fundName},'%') or asset.register_number like concat('%',#{fundName},'%') )
@@ -114,8 +112,6 @@
         on asset.file_id = file.id
         join PPW_EMAIL.email_parse_info parse
         on file.email_id = parse.id
-        left join PPW_EMAIL.pvn_fund_info info
-        on asset.fund_id=info.fund_id and info.isvalid=1
         where asset.isvalid=1 and file.isvalid=1 and parse.isvalid=1
         <if test="fundName != null and fundName !=''">
             and (asset.fund_name like concat('%',#{fundName},'%') or asset.register_number like concat('%',#{fundName},'%') )

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

@@ -65,7 +65,7 @@ public class FundInformationServiceImpl implements FundInformationService {
         Map<String, String> map = new HashMap<>();
         List<FundInfoDO> result = fundInfoMapper.searchFundInfoListByFundIdList(fundIdList);
         for (FundInfoDO fundInformationDO : result) {
-            map.put(fundInformationDO.getFundId(), fundInformationDO.getFundShortName());
+            map.put(fundInformationDO.getFundId(), fundInformationDO.getFundName());
         }
         return map;
     }

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

@@ -65,6 +65,16 @@ public class ParseEmailDetailServiceImpl implements ParseEmailDetailService {
             parseDetailPageQuery.setUpdateEndDate(DateUtil.getAroundDate(DateUtils.parse(parseDetailPageQuery.getUpdateEndDate(),DateUtils.YYYY_MM_DD),1));
         }
         List<EmailFundAssetDO> dataList = emailFundAssetMapper.searchAssetDetail(parseDetailPageQuery);
+        List<String> fundIdList = dataList.stream().filter(e -> StringUtil.isNotEmpty(e.getFundId())).map(e -> e.getFundId()).collect(Collectors.toList());
+        if(!fundIdList.isEmpty()){
+            Map<String,String> fundIdNameMap = fundInformationService.getFundIdNameByFundIdList(fundIdList);
+            for (EmailFundAssetDO emailFundAssetDO : dataList) {
+                if(StringUtil.isNotEmpty(emailFundAssetDO.getFundId())){
+                    emailFundAssetDO.setTargetFundId(emailFundAssetDO.getFundId());
+                    emailFundAssetDO.setTargetFundName(fundIdNameMap.get(emailFundAssetDO.getFundId()));
+                }
+            }
+        }
         List<EmailFundAssetVO> voList = dataList.stream().map(EmailFundAssetDO::toVo).collect(Collectors.toList());
         long total = emailFundAssetMapper.countAssetDetail(parseDetailPageQuery);
         return MybatisPage.of(total,voList);