周日报列表接口增加第几周查询条件

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/report/dto/report/ReportListQueryDTO.java

@@ -22,6 +22,9 @@ public class ReportListQueryDTO {
     @Schema(description = "报告月份")
     private Short reportMonth;
 
+    @Schema(description = "报告周")
+    private Short reportWeek;
+
     @NotBlank(message = "用户ID不能为空")
     @Schema(description = "用户ID", example = "11742")
     private String userId;

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/report/ReportServiceImpl.java

@@ -207,7 +207,7 @@ public class ReportServiceImpl implements ReportService {
         if ("daily".equals(reqVO.getReportType())) {
             queryWrapperX.betweenIfPresent(ReportDO::getReportStartDate, DateUtils.getStartDateTime(reqVO.getReportYear(), reqVO.getReportMonth()), DateUtils.getEndDateTime(reqVO.getReportYear(), reqVO.getReportMonth()));
         } else {
-            queryWrapperX.eqIfPresent(ReportDO::getReportYear, reqVO.getReportYear()).eqIfPresent(ReportDO::getReportMonth, reqVO.getReportMonth());
+            queryWrapperX.eqIfPresent(ReportDO::getReportYear, reqVO.getReportYear()).eqIfPresent(ReportDO::getReportMonth, reqVO.getReportMonth()).eqIfPresent(ReportDO::getReportWeek,reqVO.getReportWeek());
         }
         List<ReportRespVO> reportList = ReportConvert.INSTANCE.convertList(reportMapper.selectList(queryWrapperX));
         if (CollectionUtil.isEmpty(reportList)) {