Merge remote-tracking branch 'origin/master'

hx-oa/src/main/java/com/fjhx/oa/entity/schedule/dto/ScheduleInfoSelectDto.java

@@ -10,15 +10,38 @@ import java.util.Date;
 /**
  * 日程信息表列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-03
  */
 @Getter
 @Setter
 public class ScheduleInfoSelectDto extends BaseSelectDto {
 
-    /**按月份过滤*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    /**
+     * 按月份过滤
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date date;
 
+    /**
+     * 创建用户过滤
+     */
+    private String createUser;
+    /**
+     * 参与人id
+     */
+    private Long participantId;
+
+    /**
+     * 按月份过滤 开始日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 按月份过滤 结束日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date endDate;
+
 }

hx-oa/src/main/java/com/fjhx/oa/service/schedule/impl/ScheduleInfoServiceImpl.java

@@ -51,8 +51,11 @@ public class ScheduleInfoServiceImpl extends ServiceImpl<ScheduleInfoMapper, Sch
         if (ObjectUtil.isNotEmpty(dto.getDate())) {
             wrapper.apply("date_format(si.start_date,'%Y-%m') = date_format('" + sdf.format(dto.getDate()) + "','%Y-%m')");
         }
-        wrapper.eq("si", ScheduleInfoVo::getCreateUser, dto);
-        wrapper.eq("sd", ScheduleInfoVo::getParticipantId, dto);
+        wrapper.eq("si", ScheduleInfoVo::getCreateUser, dto.getCreateUser());
+        wrapper.eq("sd", ScheduleInfoVo::getParticipantId, dto.getParticipantId());
+        if (ObjectUtil.isNotEmpty(dto.getStartDate())) {
+            wrapper.apply("date_format(si.start_date,'%Y-%m-%d') BETWEEN date_format('" + sdf.format(dto.getStartDate()) + "','%Y-%m-%d') AND date_format('" + sdf.format(dto.getEndDate()) + "','%Y-%m-%d')");
+        }
         Page<ScheduleInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }