BJ_ZTEITS-Developers / parking-cloud-yudao

Commit dad10d858a804e4e42ba4060301e5b02e2987c6d

Authored by xingyu
1 parent 53a0d9bb

refactor: 时间区间查询传入数组

Inline Side-by-side
Showing 94 changed files with 213 additions and 528 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java
  View file @dad10d8
... ... @@ -24,11 +24,7 @@ public class BpmUserGroupPageReqVO extends PageParam {
24 24 private Integer status;
25 25  
26 26 @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
27   - @ApiModelProperty(value = "开始创建时间")
28   - private Date beginCreateTime;
29   -
30   - @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
31   - @ApiModelProperty(value = "结束创建时间")
32   - private Date endCreateTime;
  27 + @ApiModelProperty(value = "创建时间")
  28 + private Date[] createTime;
33 29  
34 30 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeavePageReqVO.java
  View file @dad10d8
... ... @@ -24,11 +24,7 @@ public class BpmOALeavePageReqVO extends PageParam {
24 24 private String reason;
25 25  
26 26 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
27   - @ApiModelProperty(value = "开始申请时间")
28   - private Date beginCreateTime;
29   -
30   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
31   - @ApiModelProperty(value = "结束申请时间")
32   - private Date endCreateTime;
  27 + @ApiModelProperty(value = "申请时间")
  28 + private Date[] createTime;
33 29  
34 30 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceMyPageReqVO.java
  View file @dad10d8
... ... @@ -33,12 +33,8 @@ public class BpmProcessInstanceMyPageReqVO extends PageParam {
33 33 @ApiModelProperty(value = "流程分类", notes = "参见 bpm_model_category 数据字典", example = "1")
34 34 private String category;
35 35  
36   - @ApiModelProperty(value = "开始的创建时间")
  36 + @ApiModelProperty(value = "创建时间")
37 37 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
38   - private Date beginCreateTime;
39   -
40   - @ApiModelProperty(value = "结束的创建时间")
41   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
42   - private Date endCreateTime;
  38 + private Date[] createTime;
43 39  
44 40 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmUserGroupMapper.java
  View file @dad10d8
... ... @@ -21,7 +21,7 @@ public interface BpmUserGroupMapper extends BaseMapperX<BpmUserGroupDO> {
21 21 return selectPage(reqVO, new LambdaQueryWrapperX<BpmUserGroupDO>()
22 22 .likeIfPresent(BpmUserGroupDO::getName, reqVO.getName())
23 23 .eqIfPresent(BpmUserGroupDO::getStatus, reqVO.getStatus())
24   - .betweenIfPresent(BpmUserGroupDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  24 + .betweenIfPresent(BpmUserGroupDO::getCreateTime, reqVO.getCreateTime())
25 25 .orderByDesc(BpmUserGroupDO::getId));
26 26 }
27 27  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOALeaveMapper.java
  View file @dad10d8
... ... @@ -22,7 +22,7 @@ public interface BpmOALeaveMapper extends BaseMapperX&lt;BpmOALeaveDO&gt; {
22 22 .eqIfPresent(BpmOALeaveDO::getResult, reqVO.getResult())
23 23 .eqIfPresent(BpmOALeaveDO::getType, reqVO.getType())
24 24 .likeIfPresent(BpmOALeaveDO::getReason, reqVO.getReason())
25   - .betweenIfPresent(BpmOALeaveDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  25 + .betweenIfPresent(BpmOALeaveDO::getCreateTime, reqVO.getCreateTime())
26 26 .orderByDesc(BpmOALeaveDO::getId));
27 27 }
28 28  
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java
  View file @dad10d8
... ... @@ -19,7 +19,7 @@ public interface BpmProcessInstanceExtMapper extends BaseMapperX&lt;BpmProcessInsta
19 19 .eqIfPresent("category", reqVO.getCategory())
20 20 .eqIfPresent("status", reqVO.getStatus())
21 21 .eqIfPresent("result", reqVO.getResult())
22   - .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  22 + .betweenIfPresent("create_time", reqVO.getCreateTime())
23 23 .orderByDesc("id"));
24 24 }
25 25  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java
  View file @dad10d8
... ... @@ -24,12 +24,8 @@ public class CodegenTablePageReqVO extends PageParam {
24 24 @ApiModelProperty(value = "表描述", example = "芋道", notes = "模糊匹配")
25 25 private String tableComment;
26 26  
27   - @ApiModelProperty(value = "开始创建时间", example = "2020-10-24 00:00:00")
  27 + @ApiModelProperty(value = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
28 28 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
29   - private Date beginCreateTime;
30   -
31   - @ApiModelProperty(value = "结束创建时间", example = "2020-10-24 23:59:59")
32   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
33   - private Date endCreateTime;
  29 + private Date[] createTime;
34 30  
35 31 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigExportReqVO.java
  View file @dad10d8
... ... @@ -22,12 +22,8 @@ public class ConfigExportReqVO {
22 22 @ApiModelProperty(value = "参数类型", example = "1", notes = "参见 SysConfigTypeEnum 枚举")
23 23 private Integer type;
24 24  
25   - @ApiModelProperty(value = "开始时间", example = "2020-10-24 00:00:00")
  25 + @ApiModelProperty(value = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
26 26 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
27   - private Date beginTime;
28   -
29   - @ApiModelProperty(value = "结束时间", example = "2020-10-24 23:59:59")
30   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
31   - private Date endTime;
  27 + private Date[] createTime;
32 28  
33 29 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigPageReqVO.java
  View file @dad10d8
... ... @@ -27,12 +27,8 @@ public class ConfigPageReqVO extends PageParam {
27 27 @ApiModelProperty(value = "参数类型", example = "1", notes = "参见 SysConfigTypeEnum 枚举")
28 28 private Integer type;
29 29  
30   - @ApiModelProperty(value = "开始时间", example = "2020-10-24 00:00:00")
  30 + @ApiModelProperty(value = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
31 31 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
32   - private Date beginTime;
33   -
34   - @ApiModelProperty(value = "结束时间", example = "2020-10-24 23:59:59")
35   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
36   - private Date endTime;
  32 + private Date[] createTime;
37 33  
38 34 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java
  View file @dad10d8
... ... @@ -25,11 +25,7 @@ public class FileConfigPageReqVO extends PageParam {
25 25 private Integer storage;
26 26  
27 27 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
28   - @ApiModelProperty(value = "开始创建时间")
29   - private Date beginCreateTime;
30   -
31   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
32   - @ApiModelProperty(value = "结束创建时间")
33   - private Date endCreateTime;
  28 + @ApiModelProperty(value = "创建时间")
  29 + private Date[] createTime;
34 30  
35 31 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePageReqVO.java
  View file @dad10d8
... ... @@ -25,11 +25,7 @@ public class FilePageReqVO extends PageParam {
25 25 private String type;
26 26  
27 27 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
28   - @ApiModelProperty(value = "开始创建时间")
29   - private Date beginCreateTime;
30   -
31   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
32   - @ApiModelProperty(value = "结束创建时间")
33   - private Date endCreateTime;
  28 + @ApiModelProperty(value = "创建时间")
  29 + private Date[] createTime;
34 30  
35 31 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogExportReqVO.java
  View file @dad10d8
... ... @@ -26,12 +26,8 @@ public class ApiAccessLogExportReqVO {
26 26 private String requestUrl;
27 27  
28 28 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
29   - @ApiModelProperty(value = "开始开始请求时间")
30   - private Date beginBeginTime;
31   -
32   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
33   - @ApiModelProperty(value = "结束开始请求时间")
34   - private Date endBeginTime;
  29 + @ApiModelProperty(value = "开始请求时间")
  30 + private Date[] beginTime;
35 31  
36 32 @ApiModelProperty(value = "执行时长", example = "100", notes = "大于等于，单位：毫秒")
37 33 private Integer duration;
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java
  View file @dad10d8
... ... @@ -31,12 +31,8 @@ public class ApiAccessLogPageReqVO extends PageParam {
31 31 private String requestUrl;
32 32  
33 33 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
34   - @ApiModelProperty(value = "开始开始请求时间")
35   - private Date beginBeginTime;
36   -
37   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
38   - @ApiModelProperty(value = "结束开始请求时间")
39   - private Date endBeginTime;
  34 + @ApiModelProperty(value = "开始请求时间")
  35 + private Date[] beginTime;
40 36  
41 37 @ApiModelProperty(value = "执行时长", example = "100", notes = "大于等于，单位：毫秒")
42 38 private Integer duration;
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogExportReqVO.java
  View file @dad10d8
... ... @@ -26,12 +26,8 @@ public class ApiErrorLogExportReqVO {
26 26 private String requestUrl;
27 27  
28 28 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
29   - @ApiModelProperty(value = "开始异常发生时间")
30   - private Date beginExceptionTime;
31   -
32   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
33   - @ApiModelProperty(value = "结束异常发生时间")
34   - private Date endExceptionTime;
  29 + @ApiModelProperty(value = "异常发生时间")
  30 + private Date[] exceptionTime;
35 31  
36 32 @ApiModelProperty(value = "处理状态", example = "0")
37 33 private Integer processStatus;
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apierrorlog/ApiErrorLogPageReqVO.java
  View file @dad10d8
... ... @@ -31,12 +31,8 @@ public class ApiErrorLogPageReqVO extends PageParam {
31 31 private String requestUrl;
32 32  
33 33 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
34   - @ApiModelProperty(value = "开始异常发生时间")
35   - private Date beginExceptionTime;
36   -
37   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
38   - @ApiModelProperty(value = "结束异常发生时间")
39   - private Date endExceptionTime;
  34 + @ApiModelProperty(value = "异常发生时间")
  35 + private Date[] exceptionTime;
40 36  
41 37 @ApiModelProperty(value = "处理状态", example = "0")
42 38 private Integer processStatus;
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoExportReqVO.java
  View file @dad10d8
... ... @@ -28,11 +28,7 @@ public class TestDemoExportReqVO {
28 28 private String remark;
29 29  
30 30 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
31   - @ApiModelProperty(value = "开始创建时间")
32   - private Date beginCreateTime;
33   -
34   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
35   - @ApiModelProperty(value = "结束创建时间")
36   - private Date endCreateTime;
  31 + @ApiModelProperty(value = "创建时间")
  32 + private Date[] createTime;
37 33  
38 34 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/test/vo/TestDemoPageReqVO.java
  View file @dad10d8
... ... @@ -30,11 +30,7 @@ public class TestDemoPageReqVO extends PageParam {
30 30 private String remark;
31 31  
32 32 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
33   - @ApiModelProperty(value = "开始创建时间")
34   - private Date beginCreateTime;
35   -
36   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
37   - @ApiModelProperty(value = "结束创建时间")
38   - private Date endCreateTime;
  33 + @ApiModelProperty(value = "创建时间")
  34 + private Date[] createTime;
39 35  
40 36 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/codegen/CodegenTableMapper.java
  View file @dad10d8
... ... @@ -21,7 +21,7 @@ public interface CodegenTableMapper extends BaseMapperX&lt;CodegenTableDO&gt; {
21 21 return selectPage(pageReqVO, new LambdaQueryWrapperX<CodegenTableDO>()
22 22 .likeIfPresent(CodegenTableDO::getTableName, pageReqVO.getTableName())
23 23 .likeIfPresent(CodegenTableDO::getTableComment, pageReqVO.getTableComment())
24   - .betweenIfPresent(CodegenTableDO::getCreateTime, pageReqVO.getBeginCreateTime(), pageReqVO.getEndCreateTime()));
  24 + .betweenIfPresent(CodegenTableDO::getCreateTime, pageReqVO.getCreateTime()));
25 25 }
26 26  
27 27 default List<CodegenTableDO> selectListByDataSourceConfigId(Long dataSourceConfigId) {
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/config/ConfigMapper.java
  View file @dad10d8
... ... @@ -22,7 +22,7 @@ public interface ConfigMapper extends BaseMapperX&lt;ConfigDO&gt; {
22 22 .likeIfPresent(ConfigDO::getName, reqVO.getName())
23 23 .likeIfPresent(ConfigDO::getConfigKey, reqVO.getKey())
24 24 .eqIfPresent(ConfigDO::getType, reqVO.getType())
25   - .betweenIfPresent(ConfigDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime()));
  25 + .betweenIfPresent(ConfigDO::getCreateTime, reqVO.getCreateTime()));
26 26 }
27 27  
28 28 default List<ConfigDO> selectList(ConfigExportReqVO reqVO) {
... ... @@ -30,7 +30,7 @@ public interface ConfigMapper extends BaseMapperX&lt;ConfigDO&gt; {
30 30 .likeIfPresent(ConfigDO::getName, reqVO.getName())
31 31 .likeIfPresent(ConfigDO::getConfigKey, reqVO.getKey())
32 32 .eqIfPresent(ConfigDO::getType, reqVO.getType())
33   - .betweenIfPresent(ConfigDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime()));
  33 + .betweenIfPresent(ConfigDO::getCreateTime, reqVO.getCreateTime()));
34 34 }
35 35  
36 36 }
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileConfigMapper.java
  View file @dad10d8
... ... @@ -22,7 +22,7 @@ public interface FileConfigMapper extends BaseMapperX&lt;FileConfigDO&gt; {
22 22 return selectPage(reqVO, new LambdaQueryWrapperX<FileConfigDO>()
23 23 .likeIfPresent(FileConfigDO::getName, reqVO.getName())
24 24 .eqIfPresent(FileConfigDO::getStorage, reqVO.getStorage())
25   - .betweenIfPresent(FileConfigDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  25 + .betweenIfPresent(FileConfigDO::getCreateTime, reqVO.getCreateTime())
26 26 .orderByDesc(FileConfigDO::getId));
27 27 }
28 28  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileMapper.java
  View file @dad10d8
... ... @@ -19,7 +19,7 @@ public interface FileMapper extends BaseMapperX&lt;FileDO&gt; {
19 19 return selectPage(reqVO, new LambdaQueryWrapperX<FileDO>()
20 20 .likeIfPresent(FileDO::getPath, reqVO.getPath())
21 21 .likeIfPresent(FileDO::getType, reqVO.getType())
22   - .betweenIfPresent(FileDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  22 + .betweenIfPresent(FileDO::getCreateTime, reqVO.getCreateTime())
23 23 .orderByDesc(FileDO::getId));
24 24 }
25 25  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/logger/ApiAccessLogMapper.java
  View file @dad10d8
... ... @@ -24,7 +24,7 @@ public interface ApiAccessLogMapper extends BaseMapperX&lt;ApiAccessLogDO&gt; {
24 24 .eqIfPresent("user_type", reqVO.getUserType())
25 25 .eqIfPresent("application_name", reqVO.getApplicationName())
26 26 .likeIfPresent("request_url", reqVO.getRequestUrl())
27   - .betweenIfPresent("begin_time", reqVO.getBeginBeginTime(), reqVO.getEndBeginTime())
  27 + .betweenIfPresent("begin_time", reqVO.getBeginTime())
28 28 .geIfPresent("duration", reqVO.getDuration())
29 29 .eqIfPresent("result_code", reqVO.getResultCode())
30 30 .orderByDesc("id")
... ... @@ -37,7 +37,7 @@ public interface ApiAccessLogMapper extends BaseMapperX&lt;ApiAccessLogDO&gt; {
37 37 .eqIfPresent("user_type", reqVO.getUserType())
38 38 .eqIfPresent("application_name", reqVO.getApplicationName())
39 39 .likeIfPresent("request_url", reqVO.getRequestUrl())
40   - .betweenIfPresent("begin_time", reqVO.getBeginBeginTime(), reqVO.getEndBeginTime())
  40 + .betweenIfPresent("begin_time", reqVO.getBeginTime())
41 41 .geIfPresent("duration", reqVO.getDuration())
42 42 .eqIfPresent("result_code", reqVO.getResultCode())
43 43 .orderByDesc("id")
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/logger/ApiErrorLogMapper.java
  View file @dad10d8
... ... @@ -24,7 +24,7 @@ public interface ApiErrorLogMapper extends BaseMapperX&lt;ApiErrorLogDO&gt; {
24 24 .eqIfPresent("user_type", reqVO.getUserType())
25 25 .eqIfPresent("application_name", reqVO.getApplicationName())
26 26 .likeIfPresent("request_url", reqVO.getRequestUrl())
27   - .betweenIfPresent("exception_time", reqVO.getBeginExceptionTime(), reqVO.getEndExceptionTime())
  27 + .betweenIfPresent("exception_time", reqVO.getExceptionTime())
28 28 .eqIfPresent("process_status", reqVO.getProcessStatus())
29 29 .orderByDesc("id")
30 30 );
... ... @@ -36,7 +36,7 @@ public interface ApiErrorLogMapper extends BaseMapperX&lt;ApiErrorLogDO&gt; {
36 36 .eqIfPresent("user_type", reqVO.getUserType())
37 37 .eqIfPresent("application_name", reqVO.getApplicationName())
38 38 .likeIfPresent("request_url", reqVO.getRequestUrl())
39   - .betweenIfPresent("exception_time", reqVO.getBeginExceptionTime(), reqVO.getEndExceptionTime())
  39 + .betweenIfPresent("exception_time", reqVO.getExceptionTime())
40 40 .eqIfPresent("process_status", reqVO.getProcessStatus())
41 41 .orderByDesc("id")
42 42 );
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/test/TestDemoMapper.java
  View file @dad10d8
... ... @@ -25,7 +25,7 @@ public interface TestDemoMapper extends BaseMapperX&lt;TestDemoDO&gt; {
25 25 .eqIfPresent(TestDemoDO::getType, reqVO.getType())
26 26 .eqIfPresent(TestDemoDO::getCategory, reqVO.getCategory())
27 27 .eqIfPresent(TestDemoDO::getRemark, reqVO.getRemark())
28   - .betweenIfPresent(TestDemoDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  28 + .betweenIfPresent(TestDemoDO::getCreateTime, reqVO.getCreateTime())
29 29 .orderByDesc(TestDemoDO::getId));
30 30 }
31 31  
... ... @@ -36,7 +36,7 @@ public interface TestDemoMapper extends BaseMapperX&lt;TestDemoDO&gt; {
36 36 .eqIfPresent(TestDemoDO::getType, reqVO.getType())
37 37 .eqIfPresent(TestDemoDO::getCategory, reqVO.getCategory())
38 38 .eqIfPresent(TestDemoDO::getRemark, reqVO.getRemark())
39   - .betweenIfPresent(TestDemoDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  39 + .betweenIfPresent(TestDemoDO::getCreateTime, reqVO.getCreateTime())
40 40 .orderByDesc(TestDemoDO::getId));
41 41 }
42 42  
... ...
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/java/dal/mapper.vm
  View file @dad10d8
... ... @@ -36,7 +36,7 @@ import ${basePackage}.module.${table.moduleName}.controller.${sceneEnum.basePack
36 36 .likeIfPresent(${table.className}DO::get${JavaField}, reqVO.get${JavaField}())
37 37 #end
38 38 #if (${column.listOperationCondition} == "BETWEEN")##情况八，Between 的时候
39   - .betweenIfPresent(${table.className}DO::get${JavaField}, reqVO.getBegin${JavaField}(), reqVO.getEnd${JavaField}())
  39 + .betweenIfPresent(${table.className}DO::get${JavaField}, reqVO.get${JavaField}())
40 40 #end
41 41 #end
42 42 #end
... ...
yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/activity/vo/ActivityPageReqVO.java
  View file @dad10d8
... ... @@ -29,36 +29,20 @@ public class ActivityPageReqVO extends PageParam {
29 29 private Integer status;
30 30  
31 31 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
32   - @ApiModelProperty(value = "开始开始时间")
33   - private Date beginStartTime;
  32 + @ApiModelProperty(value = "开始时间")
  33 + private Date[] startTime;
34 34  
35 35 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
36   - @ApiModelProperty(value = "结束开始时间")
37   - private Date endStartTime;
  36 + @ApiModelProperty(value = "结束时间")
  37 + private Date[] endTime;
38 38  
39 39 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
40   - @ApiModelProperty(value = "开始结束时间")
41   - private Date beginEndTime;
  40 + @ApiModelProperty(value = "失效时间")
  41 + private Date[] invalidTime;
42 42  
43 43 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
44   - @ApiModelProperty(value = "结束结束时间")
45   - private Date endEndTime;
46   -
47   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
48   - @ApiModelProperty(value = "开始失效时间")
49   - private Date beginInvalidTime;
50   -
51   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
52   - @ApiModelProperty(value = "结束失效时间")
53   - private Date endInvalidTime;
54   -
55   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
56   - @ApiModelProperty(value = "开始删除时间")
57   - private Date beginDeleteTime;
58   -
59   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
60   - @ApiModelProperty(value = "结束删除时间")
61   - private Date endDeleteTime;
  44 + @ApiModelProperty(value = "删除时间")
  45 + private Date[] deleteTime;
62 46  
63 47 @ApiModelProperty(value = "限制折扣字符串，使用 JSON 序列化成字符串存储")
64 48 private String timeLimitedDiscount;
... ... @@ -67,11 +51,7 @@ public class ActivityPageReqVO extends PageParam {
67 51 private String fullPrivilege;
68 52  
69 53 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
70   - @ApiModelProperty(value = "开始创建时间")
71   - private Date beginCreateTime;
72   -
73   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
74   - @ApiModelProperty(value = "结束创建时间")
75   - private Date endCreateTime;
  54 + @ApiModelProperty(value = "创建时间")
  55 + private Date[] createTime;
76 56  
77 57 }
... ...
yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/controller/admin/banner/vo/BannerPageReqVO.java
  View file @dad10d8
... ... @@ -32,11 +32,7 @@ public class BannerPageReqVO extends PageParam {
32 32 private Integer status;
33 33  
34 34 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
35   - @ApiModelProperty(value = "开始创建时间")
36   - private Date beginCreateTime;
37   -
38   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
39   - @ApiModelProperty(value = "结束创建时间")
40   - private Date endCreateTime;
  35 + @ApiModelProperty(value = "创建时间")
  36 + private Date[] createTime;
41 37  
42 38 }
... ...
yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/mysql/activity/ActivityMapper.java
  View file @dad10d8
... ... @@ -22,13 +22,13 @@ public interface ActivityMapper extends BaseMapperX&lt;ActivityDO&gt; {
22 22 .eqIfPresent(ActivityDO::getTitle, reqVO.getTitle())
23 23 .eqIfPresent(ActivityDO::getActivityType, reqVO.getActivityType())
24 24 .eqIfPresent(ActivityDO::getStatus, reqVO.getStatus())
25   - .betweenIfPresent(ActivityDO::getStartTime, reqVO.getBeginStartTime(), reqVO.getEndStartTime())
26   - .betweenIfPresent(ActivityDO::getEndTime, reqVO.getBeginEndTime(), reqVO.getEndEndTime())
27   - .betweenIfPresent(ActivityDO::getInvalidTime, reqVO.getBeginInvalidTime(), reqVO.getEndInvalidTime())
28   - .betweenIfPresent(ActivityDO::getDeleteTime, reqVO.getBeginDeleteTime(), reqVO.getEndDeleteTime())
  25 + .betweenIfPresent(ActivityDO::getStartTime, reqVO.getStartTime())
  26 + .betweenIfPresent(ActivityDO::getEndTime, reqVO.getEndTime())
  27 + .betweenIfPresent(ActivityDO::getInvalidTime, reqVO.getInvalidTime())
  28 + .betweenIfPresent(ActivityDO::getDeleteTime, reqVO.getDeleteTime())
29 29 .eqIfPresent(ActivityDO::getTimeLimitedDiscount, reqVO.getTimeLimitedDiscount())
30 30 .eqIfPresent(ActivityDO::getFullPrivilege, reqVO.getFullPrivilege())
31   - .betweenIfPresent(ActivityDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  31 + .betweenIfPresent(ActivityDO::getCreateTime, reqVO.getCreateTime())
32 32 .orderByDesc(ActivityDO::getId));
33 33 }
34 34  
... ...
yudao-module-mall/yudao-module-market-biz/src/main/java/cn/iocoder/yudao/module/market/dal/mysql/banner/BannerMapper.java
  View file @dad10d8
... ... @@ -19,8 +19,7 @@ public interface BannerMapper extends BaseMapperX&lt;BannerDO&gt; {
19 19 return selectPage(reqVO, new LambdaQueryWrapperX<BannerDO>()
20 20 .likeIfPresent(BannerDO::getTitle, reqVO.getTitle())
21 21 .eqIfPresent(BannerDO::getStatus, reqVO.getStatus())
22   - .betweenIfPresent(BannerDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
23   - .betweenIfPresent(BannerDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  22 + .betweenIfPresent(BannerDO::getCreateTime, reqVO.getCreateTime())
24 23 .orderByDesc(BannerDO::getSort));
25 24 }
26 25  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandExportReqVO.java
  View file @dad10d8
... ... @@ -22,11 +22,7 @@ public class BrandExportReqVO {
22 22 private Integer status;
23 23  
24 24 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
25   - @ApiModelProperty(value = "开始创建时间")
26   - private Date beginCreateTime;
27   -
28   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
29   - @ApiModelProperty(value = "结束创建时间")
30   - private Date endCreateTime;
  25 + @ApiModelProperty(value = "创建时间")
  26 + private Date[] createTime;
31 27  
32 28 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/BrandPageReqVO.java
  View file @dad10d8
... ... @@ -24,11 +24,7 @@ public class BrandPageReqVO extends PageParam {
24 24 private Integer status;
25 25  
26 26 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
27   - @ApiModelProperty(value = "开始创建时间")
28   - private Date beginCreateTime;
29   -
30   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
31   - @ApiModelProperty(value = "结束创建时间")
32   - private Date endCreateTime;
  27 + @ApiModelProperty(value = "创建时间")
  28 + private Date[] createTime;
33 29  
34 30 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryExportReqVO.java
  View file @dad10d8
... ... @@ -20,11 +20,7 @@ public class CategoryExportReqVO {
20 20 private Integer status;
21 21  
22 22 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
23   - @ApiModelProperty(value = "开始创建时间")
24   - private Date beginCreateTime;
25   -
26   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
27   - @ApiModelProperty(value = "结束创建时间")
28   - private Date endCreateTime;
  23 + @ApiModelProperty(value = "创建时间")
  24 + private Date[] createTime;
29 25  
30 26 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryPageReqVO.java
  View file @dad10d8
... ... @@ -25,11 +25,7 @@ public class CategoryPageReqVO extends PageParam {
25 25 private Integer status;
26 26  
27 27 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
28   - @ApiModelProperty(value = "开始创建时间")
29   - private Date beginCreateTime;
30   -
31   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
32   - @ApiModelProperty(value = "结束创建时间")
33   - private Date endCreateTime;
  28 + @ApiModelProperty(value = "创建时间")
  29 + private Date[] createTime;
34 30  
35 31 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/CategoryTreeListReqVO.java
  View file @dad10d8
... ... @@ -20,10 +20,6 @@ public class CategoryTreeListReqVO extends CategoryExportReqVO {
20 20 private Integer status;
21 21  
22 22 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
23   - @ApiModelProperty(value = "开始创建时间")
24   - private Date beginCreateTime;
25   -
26   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
27   - @ApiModelProperty(value = "结束创建时间")
28   - private Date endCreateTime;
  23 + @ApiModelProperty(value = "创建时间")
  24 + private Date[] createTime;
29 25 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyExportReqVO.java
  View file @dad10d8
... ... @@ -19,11 +19,7 @@ public class ProductPropertyExportReqVO {
19 19 private Integer status;
20 20  
21 21 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
22   - @ApiModelProperty(value = "开始创建时间")
23   - private Date beginCreateTime;
24   -
25   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
26   - @ApiModelProperty(value = "结束创建时间")
27   - private Date endCreateTime;
  22 + @ApiModelProperty(value = "创建时间")
  23 + private Date[] createTime;
28 24  
29 25 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyPageReqVO.java
  View file @dad10d8
... ... @@ -21,11 +21,7 @@ public class ProductPropertyPageReqVO extends PageParam {
21 21 private Integer status;
22 22  
23 23 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
24   - @ApiModelProperty(value = "开始创建时间")
25   - private Date beginCreateTime;
26   -
27   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
28   - @ApiModelProperty(value = "结束创建时间")
29   - private Date endCreateTime;
  24 + @ApiModelProperty(value = "创建时间")
  25 + private Date[] createTime;
30 26  
31 27 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuExportReqVO.java
  View file @dad10d8
... ... @@ -37,11 +37,7 @@ public class ProductSkuExportReqVO {
37 37 private Integer status;
38 38  
39 39 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
40   - @ApiModelProperty(value = "开始创建时间")
41   - private Date beginCreateTime;
42   -
43   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
44   - @ApiModelProperty(value = "结束创建时间")
45   - private Date endCreateTime;
  40 + @ApiModelProperty(value = "创建时间")
  41 + private Date[] createTime;
46 42  
47 43 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuPageReqVO.java
  View file @dad10d8
... ... @@ -39,11 +39,7 @@ public class ProductSkuPageReqVO extends PageParam {
39 39 private Integer status;
40 40  
41 41 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
42   - @ApiModelProperty(value = "开始创建时间")
43   - private Date beginCreateTime;
44   -
45   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
46   - @ApiModelProperty(value = "结束创建时间")
47   - private Date endCreateTime;
  42 + @ApiModelProperty(value = "创建时间")
  43 + private Date[] createTime;
48 44  
49 45 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuExportReqVO.java
  View file @dad10d8
... ... @@ -43,11 +43,7 @@ public class SpuExportReqVO {
43 43 private Boolean status;
44 44  
45 45 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
46   - @ApiModelProperty(value = "开始创建时间")
47   - private Date beginCreateTime;
48   -
49   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
50   - @ApiModelProperty(value = "结束创建时间")
51   - private Date endCreateTime;
  46 + @ApiModelProperty(value = "创建时间")
  47 + private Date[] createTime;
52 48  
53 49 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/SpuPageReqVO.java
  View file @dad10d8
... ... @@ -45,11 +45,7 @@ public class SpuPageReqVO extends PageParam {
45 45 private Boolean status;
46 46  
47 47 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
48   - @ApiModelProperty(value = "开始创建时间")
49   - private Date beginCreateTime;
50   -
51   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
52   - @ApiModelProperty(value = "结束创建时间")
53   - private Date endCreateTime;
  48 + @ApiModelProperty(value = "创建时间")
  49 + private Date[] createTime;
54 50  
55 51 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/brand/BrandMapper.java
  View file @dad10d8
... ... @@ -22,7 +22,7 @@ public interface BrandMapper extends BaseMapperX&lt;BrandDO&gt; {
22 22 .eqIfPresent(BrandDO::getCategoryId, reqVO.getCategoryId())
23 23 .likeIfPresent(BrandDO::getName, reqVO.getName())
24 24 .eqIfPresent(BrandDO::getStatus, reqVO.getStatus())
25   - .betweenIfPresent(BrandDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  25 + .betweenIfPresent(BrandDO::getCreateTime, reqVO.getCreateTime())
26 26 .orderByDesc(BrandDO::getId));
27 27 }
28 28  
... ... @@ -31,7 +31,7 @@ public interface BrandMapper extends BaseMapperX&lt;BrandDO&gt; {
31 31 .eqIfPresent(BrandDO::getCategoryId, reqVO.getCategoryId())
32 32 .likeIfPresent(BrandDO::getName, reqVO.getName())
33 33 .eqIfPresent(BrandDO::getStatus, reqVO.getStatus())
34   - .betweenIfPresent(BrandDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  34 + .betweenIfPresent(BrandDO::getCreateTime, reqVO.getCreateTime())
35 35 .orderByDesc(BrandDO::getId));
36 36 }
37 37  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/category/CategoryMapper.java
  View file @dad10d8
... ... @@ -22,7 +22,7 @@ public interface CategoryMapper extends BaseMapperX&lt;CategoryDO&gt; {
22 22 return selectPage(reqVO, new LambdaQueryWrapperX<CategoryDO>()
23 23 .likeIfPresent(CategoryDO::getName, reqVO.getName())
24 24 .eqIfPresent(CategoryDO::getStatus, reqVO.getStatus())
25   - .betweenIfPresent(CategoryDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  25 + .betweenIfPresent(CategoryDO::getCreateTime, reqVO.getCreateTime())
26 26 .orderByDesc(CategoryDO::getId));
27 27 }
28 28  
... ... @@ -30,7 +30,7 @@ public interface CategoryMapper extends BaseMapperX&lt;CategoryDO&gt; {
30 30 return selectList(new LambdaQueryWrapperX<CategoryDO>()
31 31 .likeIfPresent(CategoryDO::getName, reqVO.getName())
32 32 .eqIfPresent(CategoryDO::getStatus, reqVO.getStatus())
33   - .betweenIfPresent(CategoryDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  33 + .betweenIfPresent(CategoryDO::getCreateTime, reqVO.getCreateTime())
34 34 .orderByDesc(CategoryDO::getId));
35 35 }
36 36  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/property/ProductPropertyMapper.java
  View file @dad10d8
... ... @@ -21,7 +21,7 @@ public interface ProductPropertyMapper extends BaseMapperX&lt;ProductPropertyDO&gt; {
21 21 return selectPage(reqVO, new LambdaQueryWrapperX<ProductPropertyDO>()
22 22 .likeIfPresent(ProductPropertyDO::getName, reqVO.getName())
23 23 .eqIfPresent(ProductPropertyDO::getStatus, reqVO.getStatus())
24   - .betweenIfPresent(ProductPropertyDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  24 + .betweenIfPresent(ProductPropertyDO::getCreateTime, reqVO.getCreateTime())
25 25 .orderByDesc(ProductPropertyDO::getId));
26 26 }
27 27  
... ... @@ -29,7 +29,7 @@ public interface ProductPropertyMapper extends BaseMapperX&lt;ProductPropertyDO&gt; {
29 29 return selectList(new LambdaQueryWrapperX<ProductPropertyDO>()
30 30 .likeIfPresent(ProductPropertyDO::getName, reqVO.getName())
31 31 .eqIfPresent(ProductPropertyDO::getStatus, reqVO.getStatus())
32   - .betweenIfPresent(ProductPropertyDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  32 + .betweenIfPresent(ProductPropertyDO::getCreateTime, reqVO.getCreateTime())
33 33 .orderByDesc(ProductPropertyDO::getId));
34 34 }
35 35  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
  View file @dad10d8
... ... @@ -28,7 +28,7 @@ public interface ProductSkuMapper extends BaseMapperX&lt;ProductSkuDO&gt; {
28 28 .eqIfPresent(ProductSkuDO::getBarCode, reqVO.getBarCode())
29 29 .eqIfPresent(ProductSkuDO::getPicUrl, reqVO.getPicUrl())
30 30 .eqIfPresent(ProductSkuDO::getStatus, reqVO.getStatus())
31   - .betweenIfPresent(ProductSkuDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  31 + .betweenIfPresent(ProductSkuDO::getCreateTime, reqVO.getCreateTime())
32 32 .orderByDesc(ProductSkuDO::getId));
33 33 }
34 34  
... ... @@ -42,7 +42,7 @@ public interface ProductSkuMapper extends BaseMapperX&lt;ProductSkuDO&gt; {
42 42 .eqIfPresent(ProductSkuDO::getBarCode, reqVO.getBarCode())
43 43 .eqIfPresent(ProductSkuDO::getPicUrl, reqVO.getPicUrl())
44 44 .eqIfPresent(ProductSkuDO::getStatus, reqVO.getStatus())
45   - .betweenIfPresent(ProductSkuDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  45 + .betweenIfPresent(ProductSkuDO::getCreateTime, reqVO.getCreateTime())
46 46 .orderByDesc(ProductSkuDO::getId));
47 47 }
48 48  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/spu/ProductSpuMapper.java
  View file @dad10d8
... ... @@ -29,7 +29,7 @@ public interface ProductSpuMapper extends BaseMapperX&lt;ProductSpuDO&gt; {
29 29 .eqIfPresent(ProductSpuDO::getPrice, reqVO.getPrice())
30 30 .eqIfPresent(ProductSpuDO::getQuantity, reqVO.getQuantity())
31 31 .eqIfPresent(ProductSpuDO::getStatus, reqVO.getStatus())
32   - .betweenIfPresent(ProductSpuDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  32 + .betweenIfPresent(ProductSpuDO::getCreateTime, reqVO.getCreateTime())
33 33 .orderByDesc(ProductSpuDO::getId));
34 34 }
35 35  
... ... @@ -45,7 +45,7 @@ public interface ProductSpuMapper extends BaseMapperX&lt;ProductSpuDO&gt; {
45 45 .eqIfPresent(ProductSpuDO::getPrice, reqVO.getPrice())
46 46 .eqIfPresent(ProductSpuDO::getQuantity, reqVO.getQuantity())
47 47 .eqIfPresent(ProductSpuDO::getStatus, reqVO.getStatus())
48   - .betweenIfPresent(ProductSpuDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  48 + .betweenIfPresent(ProductSpuDO::getCreateTime, reqVO.getCreateTime())
49 49 .orderByDesc(ProductSpuDO::getId));
50 50 }
51 51  
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/merchant/vo/app/PayAppExportReqVO.java
  View file @dad10d8
... ... @@ -31,11 +31,7 @@ public class PayAppExportReqVO {
31 31 private String merchantName;
32 32  
33 33 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
34   - @ApiModelProperty(value = "开始创建时间")
35   - private Date beginCreateTime;
36   -
37   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
38   - @ApiModelProperty(value = "结束创建时间")
39   - private Date endCreateTime;
  34 + @ApiModelProperty(value = "创建时间")
  35 + private Date[] createTime;
40 36  
41 37 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/merchant/vo/app/PayAppPageReqVO.java
  View file @dad10d8
... ... @@ -33,11 +33,7 @@ public class PayAppPageReqVO extends PageParam {
33 33 private String merchantName;
34 34  
35 35 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
36   - @ApiModelProperty(value = "开始创建时间")
37   - private Date beginCreateTime;
38   -
39   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
40   - @ApiModelProperty(value = "结束创建时间")
41   - private Date endCreateTime;
  36 + @ApiModelProperty(value = "创建时间")
  37 + private Date[] createTime;
42 38  
43 39 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/merchant/vo/channel/PayChannelExportReqVO.java
  View file @dad10d8
... ... @@ -34,11 +34,7 @@ public class PayChannelExportReqVO {
34 34 private String config;
35 35  
36 36 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
37   - @ApiModelProperty(value = "开始创建时间")
38   - private Date beginCreateTime;
39   -
40   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
41   - @ApiModelProperty(value = "结束创建时间")
42   - private Date endCreateTime;
  37 + @ApiModelProperty(value = "创建时间")
  38 + private Date[] createTime;
43 39  
44 40 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/merchant/vo/channel/PayChannelPageReqVO.java
  View file @dad10d8
... ... @@ -36,11 +36,7 @@ public class PayChannelPageReqVO extends PageParam {
36 36 private String config;
37 37  
38 38 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
39   - @ApiModelProperty(value = "开始创建时间")
40   - private Date beginCreateTime;
41   -
42   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
43   - @ApiModelProperty(value = "结束创建时间")
44   - private Date endCreateTime;
  39 + @ApiModelProperty(value = "创建时间")
  40 + private Date[] createTime;
45 41  
46 42 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/merchant/vo/merchant/PayMerchantExportReqVO.java
  View file @dad10d8
... ... @@ -28,11 +28,7 @@ public class PayMerchantExportReqVO {
28 28 private String remark;
29 29  
30 30 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
31   - @ApiModelProperty(value = "开始创建时间")
32   - private Date beginCreateTime;
33   -
34   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
35   - @ApiModelProperty(value = "结束创建时间")
36   - private Date endCreateTime;
  31 + @ApiModelProperty(value = "创建时间")
  32 + private Date[] createTime;
37 33  
38 34 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/merchant/vo/merchant/PayMerchantPageReqVO.java
  View file @dad10d8
... ... @@ -30,11 +30,7 @@ public class PayMerchantPageReqVO extends PageParam {
30 30 private String remark;
31 31  
32 32 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
33   - @ApiModelProperty(value = "开始创建时间")
34   - private Date beginCreateTime;
35   -
36   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
37   - @ApiModelProperty(value = "结束创建时间")
38   - private Date endCreateTime;
  33 + @ApiModelProperty(value = "创建时间")
  34 + private Date[] createTime;
39 35  
40 36 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/vo/PayOrderExportReqVO.java
  View file @dad10d8
... ... @@ -56,28 +56,16 @@ public class PayOrderExportReqVO {
56 56 private String userIp;
57 57  
58 58 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
59   - @ApiModelProperty(value = "开始订单失效时间")
60   - private Date beginExpireTime;
61   -
62   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
63   - @ApiModelProperty(value = "结束订单失效时间")
64   - private Date endExpireTime;
  59 + @ApiModelProperty(value = "订单失效时间")
  60 + private Date[] expireTime;
65 61  
66 62 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
67 63 @ApiModelProperty(value = "开始订单支付成功时间")
68   - private Date beginSuccessTime;
69   -
70   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
71   - @ApiModelProperty(value = "结束订单支付成功时间")
72   - private Date endSuccessTime;
  64 + private Date[] successTime;
73 65  
74 66 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
75 67 @ApiModelProperty(value = "开始订单支付通知时间")
76   - private Date beginNotifyTime;
77   -
78   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
79   - @ApiModelProperty(value = "结束订单支付通知时间")
80   - private Date endNotifyTime;
  68 + private Date[] notifyTime;
81 69  
82 70 @ApiModelProperty(value = "支付成功的订单拓展单编号")
83 71 private Long successExtensionId;
... ... @@ -98,11 +86,7 @@ public class PayOrderExportReqVO {
98 86 private String channelOrderNo;
99 87  
100 88 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
101   - @ApiModelProperty(value = "开始创建时间")
102   - private Date beginCreateTime;
103   -
104   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
105   - @ApiModelProperty(value = "结束创建时间")
106   - private Date endCreateTime;
  89 + @ApiModelProperty(value = "创建时间")
  90 + private Date[] createTime;
107 91  
108 92 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/vo/PayOrderPageReqVO.java
  View file @dad10d8
... ... @@ -61,28 +61,16 @@ public class PayOrderPageReqVO extends PageParam {
61 61 private String userIp;
62 62  
63 63 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
64   - @ApiModelProperty(value = "开始订单失效时间")
65   - private Date beginExpireTime;
  64 + @ApiModelProperty(value = "订单失效时间")
  65 + private Date[] expireTime;
66 66  
67 67 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
68   - @ApiModelProperty(value = "结束订单失效时间")
69   - private Date endExpireTime;
  68 + @ApiModelProperty(value = "订单支付成功时间")
  69 + private Date[] successTime;
70 70  
71 71 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
72   - @ApiModelProperty(value = "开始订单支付成功时间")
73   - private Date beginSuccessTime;
74   -
75   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
76   - @ApiModelProperty(value = "结束订单支付成功时间")
77   - private Date endSuccessTime;
78   -
79   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
80   - @ApiModelProperty(value = "开始订单支付通知时间")
81   - private Date beginNotifyTime;
82   -
83   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
84   - @ApiModelProperty(value = "结束订单支付通知时间")
85   - private Date endNotifyTime;
  72 + @ApiModelProperty(value = "订单支付通知时间")
  73 + private Date[] notifyTime;
86 74  
87 75 @ApiModelProperty(value = "支付成功的订单拓展单编号")
88 76 private Long successExtensionId;
... ... @@ -103,11 +91,7 @@ public class PayOrderPageReqVO extends PageParam {
103 91 private String channelOrderNo;
104 92  
105 93 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
106   - @ApiModelProperty(value = "开始创建时间")
107   - private Date beginCreateTime;
108   -
109   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
110   - @ApiModelProperty(value = "结束创建时间")
111   - private Date endCreateTime;
  94 + @ApiModelProperty(value = "创建时间")
  95 + private Date[] createTime;
112 96  
113 97 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/vo/PayRefundExportReqVO.java
  View file @dad10d8
... ... @@ -77,35 +77,19 @@ public class PayRefundExportReqVO {
77 77 private String channelExtras;
78 78  
79 79 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
80   - @ApiModelProperty(value = "开始退款失效时间")
81   - private Date beginExpireTime;
  80 + @ApiModelProperty(value = "退款失效时间")
  81 + private Date[] expireTime;
82 82  
83 83 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
84   - @ApiModelProperty(value = "结束退款失效时间")
85   - private Date endExpireTime;
  84 + @ApiModelProperty(value = "退款成功时间")
  85 + private Date[] successTime;
86 86  
87 87 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
88   - @ApiModelProperty(value = "开始退款成功时间")
89   - private Date beginSuccessTime;
  88 + @ApiModelProperty(value = "退款通知时间")
  89 + private Date[] notifyTime;
90 90  
91 91 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
92   - @ApiModelProperty(value = "结束退款成功时间")
93   - private Date endSuccessTime;
94   -
95   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
96   - @ApiModelProperty(value = "开始退款通知时间")
97   - private Date beginNotifyTime;
98   -
99   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
100   - @ApiModelProperty(value = "结束退款通知时间")
101   - private Date endNotifyTime;
102   -
103   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
104   - @ApiModelProperty(value = "开始创建时间")
105   - private Date beginCreateTime;
106   -
107   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
108   - @ApiModelProperty(value = "结束创建时间")
109   - private Date endCreateTime;
  92 + @ApiModelProperty(value = "创建时间")
  93 + private Date[] createTime;
110 94  
111 95 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/vo/PayRefundPageReqVO.java
  View file @dad10d8
... ... @@ -82,35 +82,19 @@ public class PayRefundPageReqVO extends PageParam {
82 82 private String channelExtras;
83 83  
84 84 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
85   - @ApiModelProperty(value = "开始退款失效时间")
86   - private Date beginExpireTime;
  85 + @ApiModelProperty(value = "退款失效时间")
  86 + private Date[] expireTime;
87 87  
88 88 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
89   - @ApiModelProperty(value = "结束退款失效时间")
90   - private Date endExpireTime;
  89 + @ApiModelProperty(value = "退款成功时间")
  90 + private Date[] successTime;
91 91  
92 92 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
93   - @ApiModelProperty(value = "开始退款成功时间")
94   - private Date beginSuccessTime;
  93 + @ApiModelProperty(value = "退款通知时间")
  94 + private Date[] notifyTime;
95 95  
96 96 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
97   - @ApiModelProperty(value = "结束退款成功时间")
98   - private Date endSuccessTime;
99   -
100   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
101   - @ApiModelProperty(value = "开始退款通知时间")
102   - private Date beginNotifyTime;
103   -
104   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
105   - @ApiModelProperty(value = "结束退款通知时间")
106   - private Date endNotifyTime;
107   -
108   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
109   - @ApiModelProperty(value = "开始创建时间")
110   - private Date beginCreateTime;
111   -
112   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
113   - @ApiModelProperty(value = "结束创建时间")
114   - private Date endCreateTime;
  97 + @ApiModelProperty(value = "创建时间")
  98 + private Date[] createTime;
115 99  
116 100 }
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/merchant/PayAppMapper.java
  View file @dad10d8
... ... @@ -23,7 +23,7 @@ public interface PayAppMapper extends BaseMapperX&lt;PayAppDO&gt; {
23 23 .eqIfPresent("pay_notify_url", reqVO.getPayNotifyUrl())
24 24 .eqIfPresent("refund_notify_url", reqVO.getRefundNotifyUrl())
25 25 .inIfPresent("merchant_id", merchantIds)
26   - .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  26 + .betweenIfPresent("create_time", reqVO.getCreateTime())
27 27 .orderByDesc("id"));
28 28 }
29 29  
... ... @@ -35,7 +35,7 @@ public interface PayAppMapper extends BaseMapperX&lt;PayAppDO&gt; {
35 35 .eqIfPresent("pay_notify_url", reqVO.getPayNotifyUrl())
36 36 .eqIfPresent("refund_notify_url", reqVO.getRefundNotifyUrl())
37 37 .inIfPresent("merchant_id", merchantIds)
38   - .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  38 + .betweenIfPresent("create_time", reqVO.getCreateTime())
39 39 .orderByDesc("id"));
40 40 }
41 41  
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/merchant/PayChannelMapper.java
  View file @dad10d8
... ... @@ -32,7 +32,7 @@ public interface PayChannelMapper extends BaseMapperX&lt;PayChannelDO&gt; {
32 32 .eqIfPresent("fee_rate", reqVO.getFeeRate())
33 33 .eqIfPresent("merchant_id", reqVO.getMerchantId())
34 34 .eqIfPresent("app_id", reqVO.getAppId())
35   - .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  35 + .betweenIfPresent("create_time", reqVO.getCreateTime())
36 36 .orderByDesc("id"));
37 37 }
38 38  
... ... @@ -44,7 +44,7 @@ public interface PayChannelMapper extends BaseMapperX&lt;PayChannelDO&gt; {
44 44 .eqIfPresent("fee_rate", reqVO.getFeeRate())
45 45 .eqIfPresent("merchant_id", reqVO.getMerchantId())
46 46 .eqIfPresent("app_id", reqVO.getAppId())
47   - .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  47 + .betweenIfPresent("create_time", reqVO.getCreateTime())
48 48 .orderByDesc("id"));
49 49 }
50 50  
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/merchant/PayMerchantMapper.java
  View file @dad10d8
... ... @@ -20,7 +20,7 @@ public interface PayMerchantMapper extends BaseMapperX&lt;PayMerchantDO&gt; {
20 20 .likeIfPresent("short_name", reqVO.getShortName())
21 21 .eqIfPresent("status", reqVO.getStatus())
22 22 .eqIfPresent("remark", reqVO.getRemark())
23   - .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  23 + .betweenIfPresent("create_time", reqVO.getCreateTime())
24 24 .orderByDesc("id"));
25 25 }
26 26  
... ... @@ -31,7 +31,7 @@ public interface PayMerchantMapper extends BaseMapperX&lt;PayMerchantDO&gt; {
31 31 .likeIfPresent("short_name", reqVO.getShortName())
32 32 .eqIfPresent("status", reqVO.getStatus())
33 33 .eqIfPresent("remark", reqVO.getRemark())
34   - .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  34 + .betweenIfPresent("create_time", reqVO.getCreateTime())
35 35 .orderByDesc("id"));
36 36 }
37 37  
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/order/PayOrderMapper.java
  View file @dad10d8
... ... @@ -27,7 +27,7 @@ public interface PayOrderMapper extends BaseMapperX&lt;PayOrderDO&gt; {
27 27 .eqIfPresent("status", reqVO.getStatus())
28 28 .eqIfPresent("refund_status", reqVO.getRefundStatus())
29 29 .likeIfPresent("channel_order_no", reqVO.getChannelOrderNo())
30   - .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  30 + .betweenIfPresent("create_time", reqVO.getCreateTime())
31 31 .orderByDesc("id"));
32 32 }
33 33  
... ... @@ -42,7 +42,7 @@ public interface PayOrderMapper extends BaseMapperX&lt;PayOrderDO&gt; {
42 42 .eqIfPresent("status", reqVO.getStatus())
43 43 .eqIfPresent("refund_status", reqVO.getRefundStatus())
44 44 .likeIfPresent("channel_order_no", reqVO.getChannelOrderNo())
45   - .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  45 + .betweenIfPresent("create_time", reqVO.getCreateTime())
46 46 .orderByDesc("id"));
47 47 }
48 48  
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/refund/PayRefundMapper.java
  View file @dad10d8
... ... @@ -23,7 +23,7 @@ public interface PayRefundMapper extends BaseMapperX&lt;PayRefundDO&gt; {
23 23 .eqIfPresent("type", reqVO.getType())
24 24 .eqIfPresent("status", reqVO.getStatus())
25 25 .eqIfPresent("notify_status", reqVO.getNotifyStatus())
26   - .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  26 + .betweenIfPresent("create_time", reqVO.getCreateTime())
27 27 .orderByDesc("id"));
28 28 }
29 29  
... ... @@ -36,7 +36,7 @@ public interface PayRefundMapper extends BaseMapperX&lt;PayRefundDO&gt; {
36 36 .eqIfPresent("type", reqVO.getType())
37 37 .eqIfPresent("status", reqVO.getStatus())
38 38 .eqIfPresent("notify_status", reqVO.getNotifyStatus())
39   - .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  39 + .betweenIfPresent("create_time", reqVO.getCreateTime())
40 40 .orderByDesc("id"));
41 41 }
42 42  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeExportReqVO.java
  View file @dad10d8
... ... @@ -23,11 +23,7 @@ public class DictTypeExportReqVO {
23 23 private Integer status;
24 24  
25 25 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
26   - @ApiModelProperty(value = "开始创建时间")
27   - private Date beginCreateTime;
28   -
29   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
30   - @ApiModelProperty(value = "结束创建时间")
31   - private Date endCreateTime;
  26 + @ApiModelProperty(value = "创建时间")
  27 + private Date[] createTime;
32 28  
33 29 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java
  View file @dad10d8
... ... @@ -28,11 +28,7 @@ public class DictTypePageReqVO extends PageParam {
28 28 private Integer status;
29 29  
30 30 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
31   - @ApiModelProperty(value = "开始创建时间")
32   - private Date beginCreateTime;
33   -
34   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
35   - @ApiModelProperty(value = "结束创建时间")
36   - private Date endCreateTime;
  31 + @ApiModelProperty(value = "创建时间")
  32 + private Date[] createTime;
37 33  
38 34 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeExportReqVO.java
  View file @dad10d8
... ... @@ -26,11 +26,7 @@ public class ErrorCodeExportReqVO {
26 26 private String message;
27 27  
28 28 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
29   - @ApiModelProperty(value = "开始创建时间")
30   - private Date beginCreateTime;
31   -
32   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
33   - @ApiModelProperty(value = "结束创建时间")
34   - private Date endCreateTime;
  29 + @ApiModelProperty(value = "创建时间")
  30 + private Date[] createTime;
35 31  
36 32 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodePageReqVO.java
  View file @dad10d8
... ... @@ -31,11 +31,7 @@ public class ErrorCodePageReqVO extends PageParam {
31 31 private String message;
32 32  
33 33 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
34   - @ApiModelProperty(value = "开始创建时间")
35   - private Date beginCreateTime;
36   -
37   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
38   - @ApiModelProperty(value = "结束创建时间")
39   - private Date endCreateTime;
  34 + @ApiModelProperty(value = "创建时间")
  35 + private Date[] createTime;
40 36  
41 37 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogExportReqVO.java
  View file @dad10d8
... ... @@ -22,12 +22,8 @@ public class LoginLogExportReqVO {
22 22 @ApiModelProperty(value = "操作状态", example = "true")
23 23 private Boolean status;
24 24  
25   - @ApiModelProperty(value = "开始时间", example = "2020-10-24")
  25 + @ApiModelProperty(value = "登录时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
26 26 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
27   - private Date beginTime;
28   -
29   - @ApiModelProperty(value = "结束时间", example = "2020-10-24")
30   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
31   - private Date endTime;
  27 + private Date[] createTime;
32 28  
33 29 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java
  View file @dad10d8
... ... @@ -25,12 +25,8 @@ public class LoginLogPageReqVO extends PageParam {
25 25 @ApiModelProperty(value = "操作状态", example = "true")
26 26 private Boolean status;
27 27  
28   - @ApiModelProperty(value = "开始时间", example = "2020-10-24")
  28 + @ApiModelProperty(value = "登录时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
29 29 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
30   - private Date beginTime;
31   -
32   - @ApiModelProperty(value = "结束时间", example = "2020-10-24")
33   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
34   - private Date endTime;
  30 + private Date[] createTime;
35 31  
36 32 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogExportReqVO.java
  View file @dad10d8
... ... @@ -25,12 +25,8 @@ public class OperateLogExportReqVO {
25 25 @ApiModelProperty(value = "操作状态", example = "true")
26 26 private Boolean success;
27 27  
28   - @ApiModelProperty(value = "开始时间", example = "2020-10-24")
  28 + @ApiModelProperty(value = "开始时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
29 29 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
30   - private Date beginTime;
31   -
32   - @ApiModelProperty(value = "结束时间", example = "2020-10-24")
33   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
34   - private Date endTime;
  30 + private Date[] startTime;
35 31  
36 32 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java
  View file @dad10d8
... ... @@ -26,12 +26,8 @@ public class OperateLogPageReqVO extends PageParam {
26 26 @ApiModelProperty(value = "操作状态", example = "true")
27 27 private Boolean success;
28 28  
29   - @ApiModelProperty(value = "开始时间", example = "2020-10-24")
  29 + @ApiModelProperty(value = "开始时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
30 30 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
31   - private Date beginTime;
32   -
33   - @ApiModelProperty(value = "结束时间", example = "2020-10-24")
34   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
35   - private Date endTime;
  31 + private Date[] startTime;
36 32  
37 33 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleExportReqVO.java
  View file @dad10d8
... ... @@ -22,12 +22,8 @@ public class RoleExportReqVO {
22 22 @ApiModelProperty(value = "展示状态", example = "1", notes = "参见 CommonStatusEnum 枚举类")
23 23 private Integer status;
24 24  
25   - @ApiModelProperty(value = "开始时间", example = "2020-10-24")
  25 + @ApiModelProperty(value = "开始时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
26 26 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
27   - private Date beginTime;
28   -
29   - @ApiModelProperty(value = "结束时间", example = "2020-10-24")
30   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
31   - private Date endTime;
  27 + private Date[] createTime;
32 28  
33 29 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RolePageReqVO.java
  View file @dad10d8
... ... @@ -25,12 +25,8 @@ public class RolePageReqVO extends PageParam {
25 25 @ApiModelProperty(value = "展示状态", example = "1", notes = "参见 CommonStatusEnum 枚举类")
26 26 private Integer status;
27 27  
28   - @ApiModelProperty(value = "开始时间", example = "2020-10-24")
  28 + @ApiModelProperty(value = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
29 29 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
30   - private Date beginTime;
31   -
32   - @ApiModelProperty(value = "结束时间", example = "2020-10-24")
33   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
34   - private Date endTime;
  30 + private Date[] createTime;
35 31  
36 32 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordExportReqVO.java
  View file @dad10d8
... ... @@ -23,11 +23,7 @@ public class SensitiveWordExportReqVO {
23 23 private Integer status;
24 24  
25 25 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
26   - @ApiModelProperty(value = "开始创建时间")
27   - private Date beginCreateTime;
28   -
29   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
30   - @ApiModelProperty(value = "结束创建时间")
31   - private Date endCreateTime;
  26 + @ApiModelProperty(value = "创建时间")
  27 + private Date[] createTime;
32 28  
33 29 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordPageReqVO.java
  View file @dad10d8
... ... @@ -28,11 +28,7 @@ public class SensitiveWordPageReqVO extends PageParam {
28 28 private Integer status;
29 29  
30 30 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
31   - @ApiModelProperty(value = "开始创建时间")
32   - private Date beginCreateTime;
33   -
34   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
35   - @ApiModelProperty(value = "结束创建时间")
36   - private Date endCreateTime;
  31 + @ApiModelProperty(value = "创建时间")
  32 + private Date[] createTime;
37 33  
38 34 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/channel/SmsChannelPageReqVO.java
  View file @dad10d8
... ... @@ -25,11 +25,7 @@ public class SmsChannelPageReqVO extends PageParam {
25 25 private String signature;
26 26  
27 27 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
28   - @ApiModelProperty(value = "开始创建时间")
29   - private Date beginCreateTime;
30   -
31   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
32   - @ApiModelProperty(value = "结束创建时间")
33   - private Date endCreateTime;
  28 + @ApiModelProperty(value = "创建时间")
  29 + private Date[] createTime;
34 30  
35 31 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/log/SmsLogExportReqVO.java
  View file @dad10d8
... ... @@ -27,21 +27,13 @@ public class SmsLogExportReqVO {
27 27  
28 28 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
29 29 @ApiModelProperty(value = "开始发送时间")
30   - private Date beginSendTime;
31   -
32   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
33   - @ApiModelProperty(value = "结束发送时间")
34   - private Date endSendTime;
  30 + private Date[] sendTime;
35 31  
36 32 @ApiModelProperty(value = "接收状态", example = "0")
37 33 private Integer receiveStatus;
38 34  
39 35 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
40 36 @ApiModelProperty(value = "开始接收时间")
41   - private Date beginReceiveTime;
42   -
43   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
44   - @ApiModelProperty(value = "结束接收时间")
45   - private Date endReceiveTime;
  37 + private Date[] receiveTime;
46 38  
47 39 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/log/SmsLogPageReqVO.java
  View file @dad10d8
... ... @@ -31,22 +31,14 @@ public class SmsLogPageReqVO extends PageParam {
31 31 private Integer sendStatus;
32 32  
33 33 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
34   - @ApiModelProperty(value = "开始发送时间")
35   - private Date beginSendTime;
36   -
37   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
38   - @ApiModelProperty(value = "结束发送时间")
39   - private Date endSendTime;
  34 + @ApiModelProperty(value = "发送时间")
  35 + private Date[] sendTime;
40 36  
41 37 @ApiModelProperty(value = "接收状态", example = "0", notes = "参见 SmsReceiveStatusEnum 枚举类")
42 38 private Integer receiveStatus;
43 39  
44 40 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
45   - @ApiModelProperty(value = "开始接收时间")
46   - private Date beginReceiveTime;
47   -
48   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
49   - @ApiModelProperty(value = "结束接收时间")
50   - private Date endReceiveTime;
  41 + @ApiModelProperty(value = "接收时间")
  42 + private Date[] receiveTime;
51 43  
52 44 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplateExportReqVO.java
  View file @dad10d8
... ... @@ -32,11 +32,7 @@ public class SmsTemplateExportReqVO {
32 32 private Long channelId;
33 33  
34 34 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
35   - @ApiModelProperty(value = "开始创建时间")
36   - private Date beginCreateTime;
37   -
38   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
39   - @ApiModelProperty(value = "结束创建时间")
40   - private Date endCreateTime;
  35 + @ApiModelProperty(value = "创建时间")
  36 + private Date[] createTime;
41 37  
42 38 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/vo/template/SmsTemplatePageReqVO.java
  View file @dad10d8
... ... @@ -37,11 +37,7 @@ public class SmsTemplatePageReqVO extends PageParam {
37 37 private Long channelId;
38 38  
39 39 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
40   - @ApiModelProperty(value = "开始创建时间")
41   - private Date beginCreateTime;
42   -
43   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
44   - @ApiModelProperty(value = "结束创建时间")
45   - private Date endCreateTime;
  40 + @ApiModelProperty(value = "创建时间")
  41 + private Date[] createTime;
46 42  
47 43 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/packages/TenantPackagePageReqVO.java
  View file @dad10d8
... ... @@ -28,11 +28,6 @@ public class TenantPackagePageReqVO extends PageParam {
28 28 private String remark;
29 29  
30 30 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
31   - @ApiModelProperty(value = "开始创建时间")
32   - private Date beginCreateTime;
33   -
34   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
35   - @ApiModelProperty(value = "结束创建时间")
36   - private Date endCreateTime;
37   -
  31 + @ApiModelProperty(value = "创建时间")
  32 + private Date[] createTime;
38 33 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantExportReqVO.java
  View file @dad10d8
... ... @@ -26,11 +26,7 @@ public class TenantExportReqVO {
26 26 private Integer status;
27 27  
28 28 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
29   - @ApiModelProperty(value = "开始创建时间")
30   - private Date beginCreateTime;
31   -
32   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
33   - @ApiModelProperty(value = "结束创建时间")
34   - private Date endCreateTime;
  29 + @ApiModelProperty(value = "创建时间")
  30 + private Date[] createTime;
35 31  
36 32 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java
  View file @dad10d8
... ... @@ -31,11 +31,7 @@ public class TenantPageReqVO extends PageParam {
31 31 private Integer status;
32 32  
33 33 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
34   - @ApiModelProperty(value = "开始创建时间")
35   - private Date beginCreateTime;
36   -
37   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
38   - @ApiModelProperty(value = "结束创建时间")
39   - private Date endCreateTime;
  34 + @ApiModelProperty(value = "创建时间")
  35 + private Date[] createTime;
40 36  
41 37 }
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserExportReqVO.java
  View file @dad10d8
... ... @@ -26,13 +26,9 @@ public class UserExportReqVO {
26 26 @ApiModelProperty(value = "展示状态", example = "1", notes = "参见 CommonStatusEnum 枚举类")
27 27 private Integer status;
28 28  
29   - @ApiModelProperty(value = "开始时间", example = "2020-10-24")
  29 + @ApiModelProperty(value = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
30 30 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
31   - private Date beginTime;
32   -
33   - @ApiModelProperty(value = "结束时间", example = "2020-10-24")
34   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
35   - private Date endTime;
  31 + private Date[] createTime;
36 32  
37 33 @ApiModelProperty(value = "部门编号", example = "1024", notes = "同时筛选子部门")
38 34 private Long deptId;
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserPageReqVO.java
  View file @dad10d8
... ... @@ -29,15 +29,7 @@ public class UserPageReqVO extends PageParam {
29 29 @ApiModelProperty(value = "展示状态", example = "1", notes = "参见 CommonStatusEnum 枚举类")
30 30 private Integer status;
31 31  
32   - @ApiModelProperty(value = "开始时间", example = "2020-10-24")
33   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
34   - private Date beginTime;
35   -
36   - @ApiModelProperty(value = "结束时间", example = "2020-10-24")
37   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
38   - private Date endTime;
39   -
40   - @ApiModelProperty(value = "开始时间", example = "2020-10-24")
  32 + @ApiModelProperty(value = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
41 33 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
42 34 private Date[] createTime;
43 35  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictTypeMapper.java
  View file @dad10d8
... ... @@ -19,7 +19,7 @@ public interface DictTypeMapper extends BaseMapperX&lt;DictTypeDO&gt; {
19 19 .likeIfPresent(DictTypeDO::getName, reqVO.getName())
20 20 .likeIfPresent(DictTypeDO::getType, reqVO.getType())
21 21 .eqIfPresent(DictTypeDO::getStatus, reqVO.getStatus())
22   - .betweenIfPresent(DictTypeDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  22 + .betweenIfPresent(DictTypeDO::getCreateTime, reqVO.getCreateTime())
23 23 .orderByDesc(DictTypeDO::getId));
24 24 }
25 25  
... ... @@ -28,7 +28,7 @@ public interface DictTypeMapper extends BaseMapperX&lt;DictTypeDO&gt; {
28 28 .likeIfPresent(DictTypeDO::getName, reqVO.getName())
29 29 .likeIfPresent(DictTypeDO::getType, reqVO.getType())
30 30 .eqIfPresent(DictTypeDO::getStatus, reqVO.getStatus())
31   - .betweenIfPresent(DictTypeDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()));
  31 + .betweenIfPresent(DictTypeDO::getCreateTime, reqVO.getCreateTime()));
32 32 }
33 33  
34 34 default DictTypeDO selectByType(String type) {
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/errorcode/ErrorCodeMapper.java
  View file @dad10d8
... ... @@ -22,7 +22,7 @@ public interface ErrorCodeMapper extends BaseMapperX&lt;ErrorCodeDO&gt; {
22 22 .likeIfPresent("application_name", reqVO.getApplicationName())
23 23 .eqIfPresent("code", reqVO.getCode())
24 24 .likeIfPresent("message", reqVO.getMessage())
25   - .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  25 + .betweenIfPresent("create_time", reqVO.getCreateTime())
26 26 .orderByDesc("code"));
27 27 }
28 28  
... ... @@ -32,7 +32,7 @@ public interface ErrorCodeMapper extends BaseMapperX&lt;ErrorCodeDO&gt; {
32 32 .likeIfPresent("application_name", reqVO.getApplicationName())
33 33 .eqIfPresent("code", reqVO.getCode())
34 34 .likeIfPresent("message", reqVO.getMessage())
35   - .betweenIfPresent("create_time", reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  35 + .betweenIfPresent("create_time", reqVO.getCreateTime())
36 36 .orderByAsc("application_name", "code"));
37 37 }
38 38  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/logger/LoginLogMapper.java
  View file @dad10d8
... ... @@ -18,7 +18,7 @@ public interface LoginLogMapper extends BaseMapperX&lt;LoginLogDO&gt; {
18 18 QueryWrapperX<LoginLogDO> query = new QueryWrapperX<LoginLogDO>()
19 19 .likeIfPresent("user_ip", reqVO.getUserIp())
20 20 .likeIfPresent("username", reqVO.getUsername())
21   - .betweenIfPresent("create_time", reqVO.getBeginTime(), reqVO.getEndTime());
  21 + .betweenIfPresent("create_time", reqVO.getCreateTime());
22 22 if (Boolean.TRUE.equals(reqVO.getStatus())) {
23 23 query.eq("result", LoginResultEnum.SUCCESS.getResult());
24 24 } else if (Boolean.FALSE.equals(reqVO.getStatus())) {
... ... @@ -32,7 +32,7 @@ public interface LoginLogMapper extends BaseMapperX&lt;LoginLogDO&gt; {
32 32 QueryWrapperX<LoginLogDO> query = new QueryWrapperX<LoginLogDO>()
33 33 .likeIfPresent("user_ip", reqVO.getUserIp())
34 34 .likeIfPresent("username", reqVO.getUsername())
35   - .betweenIfPresent("create_time", reqVO.getBeginTime(), reqVO.getEndTime());
  35 + .betweenIfPresent("create_time", reqVO.getCreateTime());
36 36 if (Boolean.TRUE.equals(reqVO.getStatus())) {
37 37 query.eq("result", LoginResultEnum.SUCCESS.getResult());
38 38 } else if (Boolean.FALSE.equals(reqVO.getStatus())) {
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/logger/OperateLogMapper.java
  View file @dad10d8
... ... @@ -20,7 +20,7 @@ public interface OperateLogMapper extends BaseMapperX&lt;OperateLogDO&gt; {
20 20 .likeIfPresent(OperateLogDO::getModule, reqVO.getModule())
21 21 .inIfPresent(OperateLogDO::getUserId, userIds)
22 22 .eqIfPresent(OperateLogDO::getType, reqVO.getType())
23   - .betweenIfPresent(OperateLogDO::getStartTime, reqVO.getBeginTime(), reqVO.getEndTime());
  23 + .betweenIfPresent(OperateLogDO::getStartTime, reqVO.getStartTime());
24 24 if (Boolean.TRUE.equals(reqVO.getSuccess())) {
25 25 query.eq(OperateLogDO::getResultCode, GlobalErrorCodeConstants.SUCCESS.getCode());
26 26 } else if (Boolean.FALSE.equals(reqVO.getSuccess())) {
... ... @@ -35,7 +35,7 @@ public interface OperateLogMapper extends BaseMapperX&lt;OperateLogDO&gt; {
35 35 .likeIfPresent(OperateLogDO::getModule, reqVO.getModule())
36 36 .inIfPresent(OperateLogDO::getUserId, userIds)
37 37 .eqIfPresent(OperateLogDO::getType, reqVO.getType())
38   - .betweenIfPresent(OperateLogDO::getStartTime, reqVO.getBeginTime(), reqVO.getEndTime());
  38 + .betweenIfPresent(OperateLogDO::getStartTime, reqVO.getStartTime());
39 39 if (Boolean.TRUE.equals(reqVO.getSuccess())) {
40 40 query.eq(OperateLogDO::getResultCode, GlobalErrorCodeConstants.SUCCESS.getCode());
41 41 } else if (Boolean.FALSE.equals(reqVO.getSuccess())) {
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/RoleMapper.java
  View file @dad10d8
... ... @@ -23,7 +23,7 @@ public interface RoleMapper extends BaseMapperX&lt;RoleDO&gt; {
23 23 .likeIfPresent(RoleDO::getName, reqVO.getName())
24 24 .likeIfPresent(RoleDO::getCode, reqVO.getCode())
25 25 .eqIfPresent(RoleDO::getStatus, reqVO.getStatus())
26   - .betweenIfPresent(BaseDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime())
  26 + .betweenIfPresent(BaseDO::getCreateTime, reqVO.getCreateTime())
27 27 .orderByDesc(RoleDO::getId));
28 28 }
29 29  
... ... @@ -32,7 +32,7 @@ public interface RoleMapper extends BaseMapperX&lt;RoleDO&gt; {
32 32 .likeIfPresent(RoleDO::getName, reqVO.getName())
33 33 .likeIfPresent(RoleDO::getCode, reqVO.getCode())
34 34 .eqIfPresent(RoleDO::getStatus, reqVO.getStatus())
35   - .betweenIfPresent(BaseDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime()));
  35 + .betweenIfPresent(BaseDO::getCreateTime, reqVO.getCreateTime()));
36 36 }
37 37  
38 38 default RoleDO selectByName(String name) {
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sensitiveword/SensitiveWordMapper.java
  View file @dad10d8
... ... @@ -25,7 +25,7 @@ public interface SensitiveWordMapper extends BaseMapperX&lt;SensitiveWordDO&gt; {
25 25 .likeIfPresent(SensitiveWordDO::getName, reqVO.getName())
26 26 .likeIfPresent(SensitiveWordDO::getTags, reqVO.getTag())
27 27 .eqIfPresent(SensitiveWordDO::getStatus, reqVO.getStatus())
28   - .betweenIfPresent(SensitiveWordDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  28 + .betweenIfPresent(SensitiveWordDO::getCreateTime, reqVO.getCreateTime())
29 29 .orderByDesc(SensitiveWordDO::getId));
30 30 }
31 31  
... ... @@ -34,7 +34,7 @@ public interface SensitiveWordMapper extends BaseMapperX&lt;SensitiveWordDO&gt; {
34 34 .likeIfPresent(SensitiveWordDO::getName, reqVO.getName())
35 35 .likeIfPresent(SensitiveWordDO::getTags, reqVO.getTag())
36 36 .eqIfPresent(SensitiveWordDO::getStatus, reqVO.getStatus())
37   - .betweenIfPresent(SensitiveWordDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  37 + .betweenIfPresent(SensitiveWordDO::getCreateTime, reqVO.getCreateTime())
38 38 .orderByDesc(SensitiveWordDO::getId));
39 39 }
40 40  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsChannelMapper.java
  View file @dad10d8
... ... @@ -17,7 +17,7 @@ public interface SmsChannelMapper extends BaseMapperX&lt;SmsChannelDO&gt; {
17 17 return selectPage(reqVO, new LambdaQueryWrapperX<SmsChannelDO>()
18 18 .likeIfPresent(SmsChannelDO::getSignature, reqVO.getSignature())
19 19 .eqIfPresent(SmsChannelDO::getStatus, reqVO.getStatus())
20   - .betweenIfPresent(SmsChannelDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  20 + .betweenIfPresent(SmsChannelDO::getCreateTime, reqVO.getCreateTime())
21 21 .orderByDesc(SmsChannelDO::getId));
22 22 }
23 23  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsLogMapper.java
  View file @dad10d8
... ... @@ -19,9 +19,9 @@ public interface SmsLogMapper extends BaseMapperX&lt;SmsLogDO&gt; {
19 19 .eqIfPresent("template_id", reqVO.getTemplateId())
20 20 .likeIfPresent("mobile", reqVO.getMobile())
21 21 .eqIfPresent("send_status", reqVO.getSendStatus())
22   - .betweenIfPresent("send_time", reqVO.getBeginSendTime(), reqVO.getEndSendTime())
  22 + .betweenIfPresent("send_time", reqVO.getSendTime())
23 23 .eqIfPresent("receive_status", reqVO.getReceiveStatus())
24   - .betweenIfPresent("receive_time", reqVO.getBeginReceiveTime(), reqVO.getEndReceiveTime())
  24 + .betweenIfPresent("receive_time", reqVO.getReceiveTime())
25 25 .orderByDesc("id"));
26 26 }
27 27  
... ... @@ -31,9 +31,9 @@ public interface SmsLogMapper extends BaseMapperX&lt;SmsLogDO&gt; {
31 31 .eqIfPresent("template_id", reqVO.getTemplateId())
32 32 .likeIfPresent("mobile", reqVO.getMobile())
33 33 .eqIfPresent("send_status", reqVO.getSendStatus())
34   - .betweenIfPresent("send_time", reqVO.getBeginSendTime(), reqVO.getEndSendTime())
  34 + .betweenIfPresent("send_time", reqVO.getSendTime())
35 35 .eqIfPresent("receive_status", reqVO.getReceiveStatus())
36   - .betweenIfPresent("receive_time", reqVO.getBeginReceiveTime(), reqVO.getEndReceiveTime())
  36 + .betweenIfPresent("receive_time", reqVO.getReceiveTime())
37 37 .orderByDesc("id"));
38 38 }
39 39  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsTemplateMapper.java
  View file @dad10d8
... ... @@ -30,7 +30,7 @@ public interface SmsTemplateMapper extends BaseMapperX&lt;SmsTemplateDO&gt; {
30 30 .likeIfPresent(SmsTemplateDO::getContent, reqVO.getContent())
31 31 .likeIfPresent(SmsTemplateDO::getApiTemplateId, reqVO.getApiTemplateId())
32 32 .eqIfPresent(SmsTemplateDO::getChannelId, reqVO.getChannelId())
33   - .betweenIfPresent(SmsTemplateDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  33 + .betweenIfPresent(SmsTemplateDO::getCreateTime, reqVO.getCreateTime())
34 34 .orderByDesc(SmsTemplateDO::getId));
35 35 }
36 36  
... ... @@ -42,7 +42,7 @@ public interface SmsTemplateMapper extends BaseMapperX&lt;SmsTemplateDO&gt; {
42 42 .likeIfPresent(SmsTemplateDO::getContent, reqVO.getContent())
43 43 .likeIfPresent(SmsTemplateDO::getApiTemplateId, reqVO.getApiTemplateId())
44 44 .eqIfPresent(SmsTemplateDO::getChannelId, reqVO.getChannelId())
45   - .betweenIfPresent(SmsTemplateDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  45 + .betweenIfPresent(SmsTemplateDO::getCreateTime, reqVO.getCreateTime())
46 46 .orderByDesc(SmsTemplateDO::getId));
47 47 }
48 48  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenant/TenantMapper.java
  View file @dad10d8
... ... @@ -26,7 +26,7 @@ public interface TenantMapper extends BaseMapperX&lt;TenantDO&gt; {
26 26 .likeIfPresent(TenantDO::getContactName, reqVO.getContactName())
27 27 .likeIfPresent(TenantDO::getContactMobile, reqVO.getContactMobile())
28 28 .eqIfPresent(TenantDO::getStatus, reqVO.getStatus())
29   - .betweenIfPresent(TenantDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  29 + .betweenIfPresent(TenantDO::getCreateTime, reqVO.getCreateTime())
30 30 .orderByDesc(TenantDO::getId));
31 31 }
32 32  
... ... @@ -36,7 +36,7 @@ public interface TenantMapper extends BaseMapperX&lt;TenantDO&gt; {
36 36 .likeIfPresent(TenantDO::getContactName, reqVO.getContactName())
37 37 .likeIfPresent(TenantDO::getContactMobile, reqVO.getContactMobile())
38 38 .eqIfPresent(TenantDO::getStatus, reqVO.getStatus())
39   - .betweenIfPresent(TenantDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  39 + .betweenIfPresent(TenantDO::getCreateTime, reqVO.getCreateTime())
40 40 .orderByDesc(TenantDO::getId));
41 41 }
42 42  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/tenant/TenantPackageMapper.java
  View file @dad10d8
... ... @@ -22,7 +22,7 @@ public interface TenantPackageMapper extends BaseMapperX&lt;TenantPackageDO&gt; {
22 22 .likeIfPresent(TenantPackageDO::getName, reqVO.getName())
23 23 .eqIfPresent(TenantPackageDO::getStatus, reqVO.getStatus())
24 24 .likeIfPresent(TenantPackageDO::getRemark, reqVO.getRemark())
25   - .betweenIfPresent(TenantPackageDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime())
  25 + .betweenIfPresent(TenantPackageDO::getCreateTime, reqVO.getCreateTime())
26 26 .orderByDesc(TenantPackageDO::getId));
27 27 }
28 28  
... ...
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java
  View file @dad10d8
... ... @@ -33,7 +33,6 @@ public interface AdminUserMapper extends BaseMapperX&lt;AdminUserDO&gt; {
33 33 .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
34 34 .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
35 35 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
36   - .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getBeginTime(),reqVO.getEndTime())
37 36 .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
38 37 .inIfPresent(AdminUserDO::getDeptId, deptIds)
39 38 .orderByDesc(AdminUserDO::getId));
... ... @@ -45,7 +44,7 @@ public interface AdminUserMapper extends BaseMapperX&lt;AdminUserDO&gt; {
45 44 .likeIfPresent(AdminUserDO::getUsername, reqVO.getUsername())
46 45 .likeIfPresent(AdminUserDO::getMobile, reqVO.getMobile())
47 46 .eqIfPresent(AdminUserDO::getStatus, reqVO.getStatus())
48   - .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getBeginTime(), reqVO.getEndTime())
  47 + .betweenIfPresent(AdminUserDO::getCreateTime, reqVO.getCreateTime())
49 48 .inIfPresent(AdminUserDO::getDeptId, deptIds));
50 49 }
51 50  
... ...