Commit 772326e7e22d6b9a3571bb631d3cb6aabfa2c6c1
1 parent
aaa3f553
feat:【crm 系统】线索查询时,增加 times 范围查询
Showing
2 changed files
with
10 additions
and
0 deletions
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmCluePageReqVO.java
| @@ -7,6 +7,11 @@ import io.swagger.v3.oas.annotations.media.Schema; | @@ -7,6 +7,11 @@ import io.swagger.v3.oas.annotations.media.Schema; | ||
| 7 | import lombok.Data; | 7 | import lombok.Data; |
| 8 | import lombok.EqualsAndHashCode; | 8 | import lombok.EqualsAndHashCode; |
| 9 | import lombok.ToString; | 9 | import lombok.ToString; |
| 10 | +import org.springframework.format.annotation.DateTimeFormat; | ||
| 11 | + | ||
| 12 | +import java.time.LocalDateTime; | ||
| 13 | + | ||
| 14 | +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | ||
| 10 | 15 | ||
| 11 | @Schema(description = "管理后台 - 线索分页 Request VO") | 16 | @Schema(description = "管理后台 - 线索分页 Request VO") |
| 12 | @Data | 17 | @Data |
| @@ -42,4 +47,8 @@ public class CrmCluePageReqVO extends PageParam { | @@ -42,4 +47,8 @@ public class CrmCluePageReqVO extends PageParam { | ||
| 42 | @Schema(description = "跟进状态", example = "true") | 47 | @Schema(description = "跟进状态", example = "true") |
| 43 | private Boolean followUpStatus; | 48 | private Boolean followUpStatus; |
| 44 | 49 | ||
| 50 | + @Schema(description = "创建时间", example = "[2023-01-01 00:00:00, 2023-01-31 23:59:59]") | ||
| 51 | + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | ||
| 52 | + private LocalDateTime[] createTime; | ||
| 53 | + | ||
| 45 | } | 54 | } |
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/clue/CrmClueMapper.java
| @@ -33,6 +33,7 @@ public interface CrmClueMapper extends BaseMapperX<CrmClueDO> { | @@ -33,6 +33,7 @@ public interface CrmClueMapper extends BaseMapperX<CrmClueDO> { | ||
| 33 | .eqIfPresent(CrmClueDO::getLevel, pageReqVO.getLevel()) | 33 | .eqIfPresent(CrmClueDO::getLevel, pageReqVO.getLevel()) |
| 34 | .eqIfPresent(CrmClueDO::getSource, pageReqVO.getSource()) | 34 | .eqIfPresent(CrmClueDO::getSource, pageReqVO.getSource()) |
| 35 | .eqIfPresent(CrmClueDO::getFollowUpStatus, pageReqVO.getFollowUpStatus()) | 35 | .eqIfPresent(CrmClueDO::getFollowUpStatus, pageReqVO.getFollowUpStatus()) |
| 36 | + .betweenIfPresent(CrmClueDO::getCreateTime, pageReqVO.getCreateTime()) | ||
| 36 | .orderByDesc(CrmClueDO::getId); | 37 | .orderByDesc(CrmClueDO::getId); |
| 37 | return selectJoinPage(pageReqVO, CrmClueDO.class, query); | 38 | return selectJoinPage(pageReqVO, CrmClueDO.class, query); |
| 38 | } | 39 | } |