fix: 上传数据增加注释

service-base/src/main/java/com/simuwang/base/pojo/vo/DistributionUploadResult.java

@@ -0,0 +1,26 @@
+package com.simuwang.base.pojo.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * FileName: NavAssetUploadResult
+ * Author:   chenjianhua
+ * Date:     2024/9/23 10:36
+ * Description: ${DESCRIPTION}
+ */
+@Data
+public class DistributionUploadResult {
+
+    /**
+     * 失败结果集
+     */
+    private List<ExcelFailDataVO> fail;
+
+    /**
+     * 成功结果集
+     */
+    private List<ExcelSuccessDataVO> success;
+
+}

service-base/src/main/java/com/simuwang/base/pojo/vo/NavAssetUploadResult.java

@@ -0,0 +1,26 @@
+package com.simuwang.base.pojo.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * FileName: NavAssetUploadResult
+ * Author:   chenjianhua
+ * Date:     2024/9/23 10:36
+ * Description: ${DESCRIPTION}
+ */
+@Data
+public class NavAssetUploadResult {
+
+    /**
+     * 失败结果集
+     */
+    private List<ExcelNavAssetFailDataVO> fail;
+
+    /**
+     * 成功结果集
+     */
+    private List<ExcelNavAssetSuccessDataVO> success;
+
+}

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

@@ -158,8 +158,8 @@ public class DistributionServiceImpl implements DistributionService {
         return vo;
     }
 
-    private Map<String,Object> parseResult(List<DistributionExcelData> list) {
-        Map<String,Object> result = new HashMap<>();
+    private DistributionUploadResult parseResult(List<DistributionExcelData> list) {
+        DistributionUploadResult result = new DistributionUploadResult();
         int startRow = 3;
         List<ExcelSuccessDataVO> successDataVOList = new ArrayList<>();
         List<ExcelFailDataVO> excelFailDataVOList = new ArrayList<>();
@@ -230,8 +230,8 @@ public class DistributionServiceImpl implements DistributionService {
                 excelFailDataVOList.add(failDataVO);
             }
         }
-        result.put("success",successDataVOList);
-        result.put("fail",excelFailDataVOList);
+        result.setSuccess(successDataVOList);
+        result.setFail(excelFailDataVOList);
         return result;
     }
 

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

@@ -154,8 +154,8 @@ public class FundNavAssetServiceImpl implements FundNavAssetService {
         return vo;
     }
 
-    private Map<String,Object> parseResult(List<NavAssetExcelData> list) {
-        Map<String,Object> result = new HashMap<>();
+    private NavAssetUploadResult parseResult(List<NavAssetExcelData> list) {
+        NavAssetUploadResult result = new NavAssetUploadResult();
         int startRow = 3;
         List<ExcelNavAssetSuccessDataVO> successDataVOList = new ArrayList<>();
         List<ExcelNavAssetFailDataVO> excelFailDataVOList = new ArrayList<>();
@@ -226,8 +226,8 @@ public class FundNavAssetServiceImpl implements FundNavAssetService {
                 excelFailDataVOList.add(failDataVO);
             }
         }
-        result.put("success",successDataVOList);
-        result.put("fail",excelFailDataVOList);
+        result.setSuccess(successDataVOList);
+        result.setFail(excelFailDataVOList);
         return result;
     }
 

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

@@ -84,10 +84,13 @@ public class ParseEmailServiceImpl implements ParseEmailService {
         if(!emailParseQuery.getTimeRange().equals(TimeRange.Custom) && !emailParseQuery.getTimeRange().equals(TimeRange.FromSetup)){
             emailParseQuery.setEndDate(DateUtils.getAroundToday(1));
             emailParseQuery.setStartDate( DateUtil.RangeTime(emailParseQuery.getTimeRange().getFloatDateSymbel(),DateUtil.getTodayDate()));
+        }else if(emailParseQuery.getTimeRange().equals(TimeRange.Custom) && StringUtil.isEmpty(emailParseQuery.getEndDate())){
+            emailParseQuery.setEndDate(DateUtils.getAroundToday(1));
         }else{
             //自定义时间，把结束时间延后一天，确保时间判断能查到结束日期当天的数据
             emailParseQuery.setEndDate(DateUtil.getAroundDate(DateUtils.parse(emailParseQuery.getEndDate(),DateUtils.YYYY_MM_DD),1));
         }
+
         List<EmailParseInfoDO> emailParseInfoDOList = emailParseInfoMapper.searchEmailList(emailParseQuery);
         List<EmailParseInfoVO> emailParseInfoVOList = emailParseInfoDOList.stream()
                 .map(EmailParseInfoDO::toVO).collect(Collectors.toList());
@@ -108,6 +111,8 @@ public class ParseEmailServiceImpl implements ParseEmailService {
         if(!timeRange.equals(TimeRange.Custom) && !timeRange.equals(TimeRange.FromSetup)){
             endDate = DateUtils.getAroundToday(1);
             startDate = DateUtil.RangeTime(timeRange.getFloatDateSymbel(),DateUtil.getTodayDate());
+        }else if(timeRange.equals(TimeRange.Custom) && StringUtil.isEmpty(endDate)){
+            endDate = DateUtils.getAroundToday(1);
         }else{
             //自定义时间，把结束时间延后一天，确保时间判断能查到结束日期当天的数据
             endDate = DateUtil.getAroundDate(DateUtils.parse(endDate,DateUtils.YYYY_MM_DD),1);