fix:定期报告解析失败的规则调整（基金名称和代码都为空才为失败）

mo-daq/src/main/java/com/smppw/modaq/domain/dto/EmailZipFileDTO.java

@@ -21,4 +21,13 @@ public class EmailZipFileDTO {
         this.emailType = emailType;
         this.filename = filename;
     }
+
+    @Override
+    public String toString() {
+        return "EmailZipFileDTO{" +
+                "filename='" + filename + '\'' +
+                ", filepath='" + filepath + '\'' +
+                ", emailType=" + emailType +
+                '}';
+    }
 }

mo-daq/src/main/java/com/smppw/modaq/domain/dto/report/ReportData.java

@@ -55,7 +55,7 @@ public abstract class ReportData implements Serializable {
             return false;
         }
         return !StrUtil.isBlank(this.baseInfo.getReportName())
-                && !StrUtil.isBlank(this.fundInfo.getFundName());
+                && StrUtil.isAllNotBlank(this.fundInfo.getFundName(), this.fundInfo.getFundCode());
     }
 
     @Override
@@ -63,7 +63,6 @@ public abstract class ReportData implements Serializable {
         return "baseInfo=" + baseInfo +
                 ", fundInfo=" + fundInfo +
                 ", aiParse=" + aiParse +
-                ", aiFileId=" + aiFileId +
                 ", reportType=" + this.getReportType();
     }
 }

mo-daq/src/main/resources/mapper/EmailFileInfoMapper.xml

@@ -248,7 +248,7 @@
         select count(1)
         from mo_email_file_info a
                  join mo_report_base_info b on b.file_id = a.id and b.report_type in ('MONTHLY', 'QUARTERLY', 'ANNUALLY')
-                 join mo_report_fund_info c on a.id = c.file_id and c.fund_name is not null
+                 join mo_report_fund_info c on a.id = c.file_id and (c.fund_name is not null or c.fund_code is not null)
         where a.file_name = #{filename}
     </select>
 
@@ -256,7 +256,7 @@
         select count(1)
         from mo_email_file_info a
                  join mo_report_base_info b on b.file_id = a.id and b.report_type = 'WEEKLY'
-                 join mo_report_fund_info c on a.id = c.file_id and c.fund_name is not null
+                 join mo_report_fund_info c on a.id = c.file_id and (c.fund_name is not null or c.fund_code is not null)
         where a.file_name = #{filename}
     </select>