Преглед на файлове

fix: 13489 数据详情页,净值和规模列表的筛选,更新日期输入结束日期,返回结果没有包含结束日期数据问题修复

chenjianhua преди 7 месеца
родител
ревизия
ed21b05a48
променени са 1 файла, в които са добавени 13 реда и са изтрити 0 реда
  1. 13 0
      service-manage/src/main/java/com/simuwang/manage/service/impl/ParseEmailDetailServiceImpl.java

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

@@ -8,6 +8,7 @@ import com.simuwang.base.pojo.dos.*;
 import com.simuwang.base.pojo.dto.query.ParseDetailPageQuery;
 import com.simuwang.base.pojo.vo.*;
 import com.simuwang.manage.service.ParseEmailDetailService;
+import com.smppw.utils.DateUtil;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,6 +39,12 @@ public class ParseEmailDetailServiceImpl implements ParseEmailDetailService {
     private EmailParseInfoMapper emailParseInfoMapper;
     @Override
     public MybatisPage<EmailFundNavVO> searchNavDetail(ParseDetailPageQuery parseDetailPageQuery) {
+        if(StringUtil.isNotEmpty(parseDetailPageQuery.getPriceEndDate())){
+            parseDetailPageQuery.setPriceEndDate(DateUtil.getAroundDate(DateUtils.parse(parseDetailPageQuery.getPriceEndDate(),DateUtils.YYYY_MM_DD),1));
+        }
+        if(StringUtil.isNotEmpty(parseDetailPageQuery.getUpdateEndDate())){
+            parseDetailPageQuery.setUpdateEndDate(DateUtil.getAroundDate(DateUtils.parse(parseDetailPageQuery.getUpdateEndDate(),DateUtils.YYYY_MM_DD),1));
+        }
         List<EmailFundNavDO> dataList = emailFundNavMapper.searchNavDetail(parseDetailPageQuery);
         List<EmailFundNavVO> voList = dataList.stream().map(EmailFundNavDO::toVo).collect(Collectors.toList());
         for(EmailFundNavVO vo : voList){
@@ -53,6 +60,12 @@ public class ParseEmailDetailServiceImpl implements ParseEmailDetailService {
 
     @Override
     public MybatisPage<EmailFundAssetVO> searchAssetDetail(ParseDetailPageQuery parseDetailPageQuery) {
+        if(StringUtil.isNotEmpty(parseDetailPageQuery.getPriceEndDate())){
+            parseDetailPageQuery.setPriceEndDate(DateUtil.getAroundDate(DateUtils.parse(parseDetailPageQuery.getPriceEndDate(),DateUtils.YYYY_MM_DD),1));
+        }
+        if(StringUtil.isNotEmpty(parseDetailPageQuery.getUpdateEndDate())){
+            parseDetailPageQuery.setUpdateEndDate(DateUtil.getAroundDate(DateUtils.parse(parseDetailPageQuery.getUpdateEndDate(),DateUtils.YYYY_MM_DD),1));
+        }
         List<EmailFundAssetDO> dataList = emailFundAssetMapper.searchAssetDetail(parseDetailPageQuery);
         List<EmailFundAssetVO> voList = dataList.stream().map(EmailFundAssetDO::toVo).collect(Collectors.toList());
         for(EmailFundAssetVO vo : voList){