fixed export

src/main/java/com/cslg/ppa/common/utils/DateUtil.java

@@ -363,6 +363,13 @@ public class DateUtil {
 	}
 
 	/**
+	 * 获取当前日期 String 对象
+	 */
+	public static String getNowDateStr() {
+		return LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+	}
+
+	/**
 	 * 获取当前日期的上月第一天 String 对象
 	 */
 	public static String getFirstDayOfMonthStr() {

src/main/java/com/cslg/ppa/service/ReportService.java

@@ -267,6 +267,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         vo.setEndTime(DateUtil.getLastDayOfMonthStr());
         List<OneClickExportVO> articleVOS = articleInfoMapper.selectArticleList(vo);
         List<ExportReportVO> reportVOS = new ArrayList<>();
+        List<Integer> articleIds = new ArrayList<>();
         if (!CollectionUtils.isEmpty(articleVOS)) {
             Map<String, List<OneClickExportVO>> map = articleVOS.stream().collect(Collectors.groupingBy(OneClickExportVO::getCategoryName));
             if (!CollectionUtils.isEmpty(map)) {
@@ -290,6 +291,7 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                             detailVO.setArticle_url(htmlLink);
                             detailVOS.add(detailVO);
                             i++;
+                            articleIds.add(reportArticleVO.getArticleId());
                         }
                     }
                     reportVO.setDetailVOS(detailVOS);
@@ -328,12 +330,20 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         map.put("business_list", list4);
         ReportTemple reportTemplate = reportTempleService.getById(1);
         String templateFilePath = fileUtils.getPath(reportTemplate.getTemplatePath());
-        String reportName = "";
+        String nowDateStr = DateUtil.getNowDateStr();
+        String year = nowDateStr.substring(0, 4);
+        String month = nowDateStr.substring(4, 6);
+        String reportName = nowDateStr + "-知识产权相关法律法规资讯整理（威世博" + year + "年第" + month + "月）-v1r00";
         //生成文档
         String fileGuid = null;
         try {
             fileGuid = this.generateReportFile(map, templateFilePath, reportName);
             //todo 后续添加导出记录
+            //添加报告
+            ReportDTO reportDTO = new ReportDTO();
+            reportDTO.setReportName(reportName);
+            reportDTO.setArticleIds(articleIds);
+            this.addReport(reportDTO);
         } catch (Exception e) {
             throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "导出资讯报告失败");
         }

src/test/java/com/cslg/ppa/PpaApplicationTests.java

@@ -413,13 +413,19 @@ class PpaApplicationTests {
 
     @Test
     void test1() {
-        final String firstDayOfMonthStr = DateUtil.getFirstDayOfMonthStr();
-        final String lastDayOfMonthStr = DateUtil.getLastDayOfMonthStr();
-
-        OneClickExportDTO vo = new OneClickExportDTO();
-        vo.setBeginTime(DateUtil.getFirstDayOfMonthStr());
-        vo.setEndTime(DateUtil.getLastDayOfMonthStr());
-        List<OneClickExportVO> articleVOS = articleInfoMapper.selectArticleList(vo);
-        System.out.println(articleVOS);
+//        final String firstDayOfMonthStr = DateUtil.getFirstDayOfMonthStr();
+//        final String lastDayOfMonthStr = DateUtil.getLastDayOfMonthStr();
+//
+//        OneClickExportDTO vo = new OneClickExportDTO();
+//        vo.setBeginTime(DateUtil.getFirstDayOfMonthStr());
+//        vo.setEndTime(DateUtil.getLastDayOfMonthStr());
+//        List<OneClickExportVO> articleVOS = articleInfoMapper.selectArticleList(vo);
+//        System.out.println(articleVOS);
+
+        String nowDateStr = DateUtil.getNowDateStr();
+        String year = nowDateStr.substring(0, 4);
+        String month = nowDateStr.substring(4, 6);
+        String reportName = nowDateStr + "-知识产权相关法律法规资讯整理（威世博" + year + "年第" + month + "月）-v1r00";
+        System.out.println(reportName);
     }
 }