|
@@ -85,7 +85,7 @@ public class FundDeletionTask {
|
|
|
List<DistributionDO> distributionDOS = distributionMapper.getDistributionByFundId(fundId, DistributeType.DIVIDENDS_SPLIT);
|
|
|
if(distributionDOS.size() > 0){
|
|
|
//存在拆分,不做分红缺失计算,同时把以往的数据添加备注
|
|
|
- deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),null,DeletionType.EXIST_SPLIT.getInfo());
|
|
|
+ deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),null,DeletionType.EXIST_SPLIT.getInfo(),null);
|
|
|
return;
|
|
|
}
|
|
|
BigDecimal threshold = new BigDecimal(0.0035);
|
|
@@ -126,7 +126,7 @@ public class FundDeletionTask {
|
|
|
Map<String,List<TradeDateDO>> tradeListMap = tradeDateDOList.stream().collect(Collectors.groupingBy(e -> DateUtils.format(e.getTradeDate(),DateUtils.YYYY_MM_DD)));
|
|
|
for(String tradeDate : tradeListMap.keySet()){
|
|
|
if(navListMap.containsKey(tradeDate)){
|
|
|
- deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo());
|
|
|
+ deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo(),null);
|
|
|
continue;
|
|
|
}
|
|
|
//写入缺失信息表
|
|
@@ -154,7 +154,7 @@ public class FundDeletionTask {
|
|
|
if(weekNavListMap.containsKey(weekOfYear)){
|
|
|
List<AssetDO> assetDOS = weekNavListMap.get(weekOfYear);
|
|
|
String tradeDate = DateUtils.format(assetDOS.get(assetDOS.size()-1).getPriceDate(),DateUtils.YYYY_MM_DD);
|
|
|
- deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo());
|
|
|
+ deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo(),null);
|
|
|
continue;
|
|
|
}
|
|
|
//不包含的话,默认取每周的最后一个交易日作为周净值日期
|
|
@@ -188,7 +188,7 @@ public class FundDeletionTask {
|
|
|
if(monthNavListMap.containsKey(yearMonth)){
|
|
|
List<AssetDO> assetDOS = monthNavListMap.get(yearMonth);
|
|
|
String tradeDate = DateUtils.format(assetDOS.get(assetDOS.size()-1).getPriceDate(),DateUtils.YYYY_MM_DD);
|
|
|
- deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo());
|
|
|
+ deletionInfoMapper.updateRemark(fundId,DeletionType.ASSET_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo(),null);
|
|
|
continue;
|
|
|
}
|
|
|
//不包含的话,默认取每周的最后一个交易日作为周净值日期
|
|
@@ -210,7 +210,7 @@ public class FundDeletionTask {
|
|
|
Map<String,List<TradeDateDO>> tradeListMap = tradeDateDOList.stream().collect(Collectors.groupingBy(e -> DateUtils.format(e.getTradeDate(),DateUtils.YYYY_MM_DD)));
|
|
|
for(String tradeDate : tradeListMap.keySet()){
|
|
|
if(navListMap.containsKey(tradeDate)){
|
|
|
- deletionInfoMapper.updateRemark(fundId,DeletionType.NAV_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo());
|
|
|
+ deletionInfoMapper.updateRemark(fundId,DeletionType.NAV_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo(),null);
|
|
|
continue;
|
|
|
}
|
|
|
//写入缺失信息表
|
|
@@ -238,7 +238,7 @@ public class FundDeletionTask {
|
|
|
if(weekNavListMap.containsKey(weekOfYear)){
|
|
|
List<NavDO> navDOS = weekNavListMap.get(weekOfYear);
|
|
|
String tradeDate = DateUtils.format(navDOS.get(navDOS.size()-1).getPriceDate(),DateUtils.YYYY_MM_DD);
|
|
|
- deletionInfoMapper.updateRemark(fundId,DeletionType.NAV_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo());
|
|
|
+ deletionInfoMapper.updateRemark(fundId,DeletionType.NAV_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo(),null);
|
|
|
continue;
|
|
|
}
|
|
|
//不包含的话,默认取每周的最后一个交易日作为周净值日期
|
|
@@ -272,7 +272,7 @@ public class FundDeletionTask {
|
|
|
if(monthNavListMap.containsKey(yearMonth)){
|
|
|
List<NavDO> navDOS = monthNavListMap.get(yearMonth);
|
|
|
String tradeDate = DateUtils.format(navDOS.get(navDOS.size()-1).getPriceDate(),DateUtils.YYYY_MM_DD);
|
|
|
- deletionInfoMapper.updateRemark(fundId,DeletionType.NAV_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo());
|
|
|
+ deletionInfoMapper.updateRemark(fundId,DeletionType.NAV_DELETION.getCode(),tradeDate,DeletionType.NO_DELETION.getInfo(),null);
|
|
|
continue;
|
|
|
}
|
|
|
//不包含的话,默认取每周的最后一个交易日作为周净值日期
|