feat(oa): 问题反馈增加时间区间查询功能
- 在OaFeedbackBo 中添加 startTime 和 endTime 字段,用于指定查询的时间区间 - 在 OaFeedbackServiceImpl 中实现时间区间查询的逻辑 - 使用 @DateTimeFormat 注解确保日期格式的一致性
This commit is contained in:
@@ -1,14 +1,12 @@
|
|||||||
package com.ruoyi.oa.domain.bo;
|
package com.ruoyi.oa.domain.bo;
|
||||||
|
|
||||||
import com.ruoyi.common.core.validate.AddGroup;
|
|
||||||
import com.ruoyi.common.core.validate.EditGroup;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import javax.validation.constraints.*;
|
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
import com.ruoyi.common.core.domain.BaseEntity;
|
import com.ruoyi.common.core.domain.BaseEntity;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 问题反馈业务对象 oa_feedback
|
* 问题反馈业务对象 oa_feedback
|
||||||
@@ -48,4 +46,15 @@ public class OaFeedbackBo extends BaseEntity {
|
|||||||
private String projectName;
|
private String projectName;
|
||||||
|
|
||||||
private Long projectId;
|
private Long projectId;
|
||||||
|
/**
|
||||||
|
* 区间开始时间
|
||||||
|
*/
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date startTime;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 区间结束时间
|
||||||
|
*/
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date endTime;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,6 +80,9 @@ public class OaFeedbackServiceImpl implements IOaFeedbackService {
|
|||||||
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_name", bo.getProjectName());
|
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_name", bo.getProjectName());
|
||||||
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_code", bo.getProjectName());
|
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_code", bo.getProjectName());
|
||||||
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_num", bo.getProjectName());
|
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_num", bo.getProjectName());
|
||||||
|
if (bo.getStartTime() != null && bo.getEndTime() != null) {
|
||||||
|
lqw.between("oaf.create_time", bo.getStartTime(), bo.getEndTime());
|
||||||
|
}
|
||||||
lqw.orderByDesc("oaf.create_time");
|
lqw.orderByDesc("oaf.create_time");
|
||||||
return lqw;
|
return lqw;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user