增加报告发送人筛选

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

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Schema(description = "管理后台 - 行政管理_工作报告分页列表查询参数")
 @Data
@@ -25,5 +26,8 @@ public class ReportPageQueryDTO extends PageParam {
     @Schema(description = "报告周")
     private Short reportWeek;
 
+    @Schema(description = "报告发送人")
+    private List<String> userIds;
+
 
 }

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

@@ -207,6 +207,9 @@ public class ReportServiceImpl implements ReportService {
         queryWrapper.eq("RECEIVE.RECEIVE_USER_ID", SecurityFrameworkUtils.getLoginUserId());
         queryWrapper.eq(StrUtil.isNotBlank(reqVO.getReportType()),"REPORT.REPORT_TYPE", reqVO.getReportType());
         queryWrapper.orderByDesc("REPORT.UPDATE_TIME");
+        if(CollectionUtil.isNotEmpty(reqVO.getUserIds())){
+            queryWrapper.in("REPORT.USER_ID", reqVO.getUserIds());
+        }
         if (reqVO.getReportYear() != null) {
             if (StrUtil.isNotBlank(reqVO.getReportType())) {
                 if ("daily".equals(reqVO.getReportType())) {