BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 26f684e9453d412a7cf762297e0dd996ebefdad3

Authored by 芋道源码
Committed by Gitee
2 parents c1e2e903 dad10d85

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

Merge pull request !223 from xingyu/master
Inline Side-by-side
Showing 134 changed files with 498 additions and 959 deletions
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/query/QueryWrapperX.java
  View file @26f684e
... ... @@ -94,6 +94,19 @@ public class QueryWrapperX<T> extends QueryWrapper<T> {
94 94 return this;
95 95 }
96 96  
  97 + public QueryWrapperX<T> betweenIfPresent(String column, Object[] values) {
  98 + if (values!= null && values[0] != null && values[1] != null) {
  99 + return (QueryWrapperX<T>) super.between(column, values[0], values[1]);
  100 + }
  101 + if (values!= null && values[0] != null) {
  102 + return (QueryWrapperX<T>) ge(column, values[0]);
  103 + }
  104 + if (values!= null && values[1] != null) {
  105 + return (QueryWrapperX<T>) le(column, values[1]);
  106 + }
  107 + return this;
  108 + }
  109 +
97 110 // ========== 重写父类方法，方便链式调用 ==========
98 111  
99 112 @Override
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java
  View file @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -21,7 +21,7 @@ public interface BpmUserGroupMapper extends BaseMapperX&lt;BpmUserGroupDO&gt; {
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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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 @26f684e
... ... @@ -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  
... ...
yudao-ui-admin-vue3/src/api/login/index.ts
  View file @26f684e
... ... @@ -62,3 +62,10 @@ export const sendSmsCodeApi = (data: SmsCodeVO) =&gt; {
62 62 export const smsLoginApi = (data: SmsLoginVO) => {
63 63 return request.post({ url: '/system/auth/sms-login', data })
64 64 }
  65 +
  66 +// 社交授权的跳转
  67 +export const socialAuthRedirectApi = (type: string, redirectUri: string) => {
  68 + return request.get({
  69 + url: '/system/auth/social-auth-redirect?type=' + type + '&redirectUri=' + redirectUri
  70 + })
  71 +}
... ...
yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue
  View file @26f684e
... ... @@ -131,6 +131,17 @@ const getRoutes = async () =&gt; {
131 131 permissionStore.setIsAddRouters(true)
132 132 push({ path: redirect.value || permissionStore.addRouters[0].path })
133 133 }
  134 +
  135 +// 社交登录
  136 +const doSocialLogin = async (type: string) => {
  137 + loginLoading.value = true
  138 + // 计算 redirectUri
  139 + const redirectUri =
  140 + location.origin + '/social-login?type=' + type + '&redirect=' + (redirect.value || '/')
  141 + // 进行跳转
  142 + const res = await LoginApi.socialAuthRedirectApi(type, encodeURIComponent(redirectUri))
  143 + window.open = res
  144 +}
134 145 watch(
135 146 () => currentRoute.value,
136 147 (route: RouteLocationNormalizedLoaded) => {
... ... @@ -267,24 +278,28 @@ onMounted(async () =&gt; {
267 278 :size="iconSize"
268 279 class="cursor-pointer anticon"
269 280 :color="iconColor"
  281 + @click="doSocialLogin('github')"
270 282 />
271 283 <Icon
272 284 icon="ant-design:wechat-filled"
273 285 :size="iconSize"
274 286 class="cursor-pointer anticon"
275 287 :color="iconColor"
  288 + @click="doSocialLogin('wechat')"
276 289 />
277 290 <Icon
278 291 icon="ant-design:alipay-circle-filled"
279 292 :size="iconSize"
280 293 :color="iconColor"
281 294 class="cursor-pointer anticon"
  295 + @click="doSocialLogin('alipay')"
282 296 />
283 297 <Icon
284 298 icon="ant-design:dingtalk-circle-filled"
285 299 :size="iconSize"
286 300 :color="iconColor"
287 301 class="cursor-pointer anticon"
  302 + @click="doSocialLogin('dingtalk')"
288 303 />
289 304 </div>
290 305 </el-form-item>
... ...
yudao-ui-admin/package.json
  View file @26f684e
... ... @@ -50,7 +50,6 @@
50 50 "fuse.js": "6.4.3",
51 51 "highlight.js": "9.18.5",
52 52 "js-beautify": "1.13.0",
53   - "js-cookie": "3.0.1",
54 53 "jsencrypt": "3.0.0-rc.1",
55 54 "nprogress": "0.2.0",
56 55 "quill": "1.3.7",
... ...
yudao-ui-admin/src/main.js
  View file @26f684e
1 1 import Vue from 'vue'
2 2  
3   -import Cookies from 'js-cookie'
4   -
5 3 import Element from 'element-ui'
6 4 import './assets/styles/element-variables.scss'
7 5  
... ... @@ -18,7 +16,7 @@ import &#39;./permission&#39; // permission control
18 16 import './tongji' // 百度统计
19 17 import { getDicts } from "@/api/system/dict/data";
20 18 import { getConfigKey } from "@/api/infra/config";
21   -import { parseTime, resetForm, addDateRange, addBeginAndEndTime, handleTree} from "@/utils/ruoyi";
  19 +import { parseTime, resetForm, handleTree} from "@/utils/ruoyi";
22 20 import Pagination from "@/components/Pagination";
23 21 // 自定义表格工具扩展
24 22 import RightToolbar from "@/components/RightToolbar"
... ... @@ -32,8 +30,6 @@ Vue.prototype.getDicts = getDicts
32 30 Vue.prototype.getConfigKey = getConfigKey
33 31 Vue.prototype.parseTime = parseTime
34 32 Vue.prototype.resetForm = resetForm
35   -Vue.prototype.addDateRange = addDateRange
36   -Vue.prototype.addBeginAndEndTime = addBeginAndEndTime
37 33 Vue.prototype.getDictDatas = getDictDatas
38 34 Vue.prototype.getDictDatas2 = getDictDatas2
39 35 Vue.prototype.getDictDataLabel = getDictDataLabel
... ... @@ -84,8 +80,8 @@ import &#39;@/styles/index.scss&#39;
84 80 */
85 81  
86 82 Vue.use(Element, {
87   - size: Cookies.get('size') || 'medium' // set element-ui default size
88   -})
  83 + size: localStorage.getItem("size") || "medium", // set element-ui default size
  84 +});
89 85  
90 86 Vue.config.productionTip = false
91 87  
... ...
yudao-ui-admin/src/store/modules/app.js
  View file @26f684e
1   -import Cookies from 'js-cookie'
2   -
3 1 const state = {
4 2 sidebar: {
5   - opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
  3 + opened: localStorage.getItem("sidebarStatus")
  4 + ? !!+localStorage.getItem("sidebarStatus")
  5 + : true,
6 6 withoutAnimation: false,
7   - hide: false
  7 + hide: false,
8 8 },
9   - device: 'desktop',
10   - size: Cookies.get('size') || 'medium'
11   -}
  9 + device: "desktop",
  10 + size: localStorage.getItem("size") || "medium",
  11 +};
12 12  
13 13 const mutations = {
14   - TOGGLE_SIDEBAR: state => {
  14 + TOGGLE_SIDEBAR: (state) => {
15 15 if (state.sidebar.hide) {
16 16 return false;
17 17 }
18   - state.sidebar.opened = !state.sidebar.opened
19   - state.sidebar.withoutAnimation = false
  18 + state.sidebar.opened = !state.sidebar.opened;
  19 + state.sidebar.withoutAnimation = false;
20 20 if (state.sidebar.opened) {
21   - Cookies.set('sidebarStatus', 1)
  21 + localStorage.setItem("sidebarStatus", 1);
22 22 } else {
23   - Cookies.set('sidebarStatus', 0)
  23 + localStorage.setItem("sidebarStatus", 0);
24 24 }
25 25 },
26 26 CLOSE_SIDEBAR: (state, withoutAnimation) => {
27   - Cookies.set('sidebarStatus', 0)
28   - state.sidebar.opened = false
29   - state.sidebar.withoutAnimation = withoutAnimation
  27 + localStorage.setItem("sidebarStatus", 0);
  28 + state.sidebar.opened = false;
  29 + state.sidebar.withoutAnimation = withoutAnimation;
30 30 },
31 31 TOGGLE_DEVICE: (state, device) => {
32   - state.device = device
  32 + state.device = device;
33 33 },
34 34 SET_SIZE: (state, size) => {
35   - state.size = size
36   - Cookies.set('size', size)
  35 + state.size = size;
  36 + localStorage.setItem("size", size);
37 37 },
38 38 SET_SIDEBAR_HIDE: (state, status) => {
39   - state.sidebar.hide = status
40   - }
41   -}
  39 + state.sidebar.hide = status;
  40 + },
  41 +};
42 42  
43 43 const actions = {
44 44 toggleSideBar({ commit }) {
45   - commit('TOGGLE_SIDEBAR')
  45 + commit("TOGGLE_SIDEBAR");
46 46 },
47 47 closeSideBar({ commit }, { withoutAnimation }) {
48   - commit('CLOSE_SIDEBAR', withoutAnimation)
  48 + commit("CLOSE_SIDEBAR", withoutAnimation);
49 49 },
50 50 toggleDevice({ commit }, device) {
51   - commit('TOGGLE_DEVICE', device)
  51 + commit("TOGGLE_DEVICE", device);
52 52 },
53 53 setSize({ commit }, size) {
54   - commit('SET_SIZE', size)
  54 + commit("SET_SIZE", size);
55 55 },
56 56 toggleSideBarHide({ commit }, status) {
57   - commit('SET_SIDEBAR_HIDE', status)
58   - }
59   -}
  57 + commit("SET_SIDEBAR_HIDE", status);
  58 + },
  59 +};
60 60  
61 61 export default {
62 62 namespaced: true,
63 63 state,
64 64 mutations,
65   - actions
66   -}
  65 + actions,
  66 +};
... ...
yudao-ui-admin/src/views/bpm/group/index.vue
  View file @26f684e
... ... @@ -13,9 +13,9 @@
13 13 :key="dict.value" :label="dict.label" :value="dict.value"/>
14 14 </el-select>
15 15 </el-form-item>
16   - <el-form-item label="创建时间">
17   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
18   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  16 + <el-form-item label="创建时间" prop="createTime">
  17 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  18 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
19 19 </el-form-item>
20 20 <el-form-item>
21 21 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -121,7 +121,6 @@ export default {
121 121 title: "",
122 122 // 是否显示弹出层
123 123 open: false,
124   - dateRangeCreateTime: [],
125 124 // 查询参数
126 125 queryParams: {
127 126 pageNo: 1,
... ... @@ -129,6 +128,7 @@ export default {
129 128 name: null,
130 129 status: null,
131 130 tenantId: null,
  131 + createTime: []
132 132 },
133 133 // 表单参数
134 134 form: {},
... ... @@ -152,11 +152,8 @@ export default {
152 152 /** 查询列表 */
153 153 getList() {
154 154 this.loading = true;
155   - // 处理查询参数
156   - let params = {...this.queryParams};
157   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
158 155 // 执行查询
159   - getUserGroupPage(params).then(response => {
  156 + getUserGroupPage(this.queryParams).then(response => {
160 157 this.list = response.data.list;
161 158 this.total = response.data.total;
162 159 this.loading = false;
... ... @@ -185,7 +182,6 @@ export default {
185 182 },
186 183 /** 重置按钮操作 */
187 184 resetQuery() {
188   - this.dateRangeCreateTime = [];
189 185 this.resetForm("queryForm");
190 186 this.handleQuery();
191 187 },
... ...
yudao-ui-admin/src/views/bpm/oa/leave/index.vue
  View file @26f684e
... ... @@ -9,9 +9,9 @@
9 9 <el-option v-for="dict in leaveTypeDictData" :key="dict.value" :label="dict.label" :value="dict.value" />
10 10 </el-select>
11 11 </el-form-item>
12   - <el-form-item label="申请时间">
13   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
14   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  12 + <el-form-item label="申请时间" prop="createTime">
  13 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  14 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
15 15 </el-form-item>
16 16 <el-form-item label="结果" prop="result">
17 17 <el-select v-model="queryParams.result" placeholder="请选择流结果" clearable>
... ... @@ -102,8 +102,6 @@ export default {
102 102 total: 0,
103 103 // 请假申请列表
104 104 list: [],
105   - //审批进度弹出层
106   - dateRangeCreateTime: [],
107 105 // 查询参数
108 106 queryParams: {
109 107 pageNo: 1,
... ... @@ -111,6 +109,7 @@ export default {
111 109 result: null,
112 110 type: null,
113 111 reason: null,
  112 + createTime: []
114 113 },
115 114  
116 115 leaveTypeDictData: getDictDatas(DICT_TYPE.BPM_OA_LEAVE_TYPE),
... ... @@ -124,11 +123,8 @@ export default {
124 123 /** 查询列表 */
125 124 getList() {
126 125 this.loading = true;
127   - // 处理查询参数
128   - let params = {...this.queryParams};
129   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
130 126 // 执行查询
131   - getLeavePage(params).then(response => {
  127 + getLeavePage(this.queryParams).then(response => {
132 128 this.list = response.data.list;
133 129 this.total = response.data.total;
134 130 this.loading = false;
... ... @@ -141,7 +137,6 @@ export default {
141 137 },
142 138 /** 重置按钮操作 */
143 139 resetQuery() {
144   - this.dateRangeCreateTime = [];
145 140 this.resetForm("queryForm");
146 141 this.handleQuery();
147 142 },
... ...
yudao-ui-admin/src/views/bpm/processInstance/index.vue
  View file @26f684e
... ... @@ -16,9 +16,9 @@
16 16 :key="dict.value" :label="dict.label" :value="dict.value"/>
17 17 </el-select>
18 18 </el-form-item>
19   - <el-form-item label="提交时间">
20   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
21   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  19 + <el-form-item label="提交时间" prop="createTime">
  20 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  21 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
22 22 </el-form-item>
23 23 <el-form-item label="状态" prop="status">
24 24 <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
... ... @@ -116,8 +116,6 @@ export default {
116 116 total: 0,
117 117 // 工作流的流程实例的拓展列表
118 118 list: [],
119   - // 是否显示弹出层
120   - dateRangeCreateTime: [],
121 119 // 查询参数
122 120 queryParams: {
123 121 pageNo: 1,
... ... @@ -127,6 +125,7 @@ export default {
127 125 category: null,
128 126 status: null,
129 127 result: null,
  128 + createTime: []
130 129 }
131 130 };
132 131 },
... ... @@ -137,11 +136,8 @@ export default {
137 136 /** 查询列表 */
138 137 getList() {
139 138 this.loading = true;
140   - // 处理查询参数
141   - let params = {...this.queryParams};
142   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
143 139 // 执行查询
144   - getMyProcessInstancePage(params).then(response => {
  140 + getMyProcessInstancePage(this.queryParams).then(response => {
145 141 this.list = response.data.list;
146 142 this.total = response.data.total;
147 143 this.loading = false;
... ... @@ -154,7 +150,6 @@ export default {
154 150 },
155 151 /** 重置按钮操作 */
156 152 resetQuery() {
157   - this.dateRangeCreateTime = [];
158 153 this.resetForm("queryForm");
159 154 this.handleQuery();
160 155 },
... ...
yudao-ui-admin/src/views/bpm/task/done.vue
  View file @26f684e
... ... @@ -7,9 +7,9 @@
7 7 <el-form-item label="流程名" prop="name">
8 8 <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
9 9 </el-form-item>
10   - <el-form-item label="创建时间">
11   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
12   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  10 + <el-form-item label="创建时间" prop="createTime">
  11 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  12 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
13 13 </el-form-item>
14 14 <el-form-item>
15 15 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -77,11 +77,11 @@ export default {
77 77 // 已办任务列表
78 78 list: [],
79 79 // 查询参数
80   - dateRangeCreateTime: [],
81 80 queryParams: {
82 81 pageNo: 1,
83 82 pageSize: 10,
84 83 name: null,
  84 + createTime: []
85 85 },
86 86 };
87 87 },
... ... @@ -92,10 +92,7 @@ export default {
92 92 /** 查询列表 */
93 93 getList() {
94 94 this.loading = true;
95   - // 处理查询参数
96   - let params = {...this.queryParams};
97   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
98   - getDoneTaskPage(params).then(response => {
  95 + getDoneTaskPage(this.queryParams).then(response => {
99 96 this.list = response.data.list;
100 97 this.total = response.data.total;
101 98 this.loading = false;
... ... @@ -108,7 +105,6 @@ export default {
108 105 },
109 106 /** 重置按钮操作 */
110 107 resetQuery() {
111   - this.dateRangeCreateTime = [];
112 108 this.resetForm("queryForm");
113 109 this.handleQuery();
114 110 },
... ...
yudao-ui-admin/src/views/bpm/task/todo.vue
  View file @26f684e
... ... @@ -7,9 +7,9 @@
7 7 <el-form-item label="流程名" prop="name">
8 8 <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
9 9 </el-form-item>
10   - <el-form-item label="创建时间">
11   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
12   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  10 + <el-form-item label="创建时间" prop="createTime">
  11 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  12 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
13 13 </el-form-item>
14 14 <el-form-item>
15 15 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -67,11 +67,11 @@ export default {
67 67 // 待办任务列表
68 68 list: [],
69 69 // 查询参数
70   - dateRangeCreateTime: [],
71 70 queryParams: {
72 71 pageNo: 1,
73 72 pageSize: 10,
74 73 name: null,
  74 + createTime: []
75 75 },
76 76 };
77 77 },
... ... @@ -83,9 +83,7 @@ export default {
83 83 getList() {
84 84 this.loading = true;
85 85 // 处理查询参数
86   - let params = {...this.queryParams};
87   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
88   - getTodoTaskPage(params).then(response => {
  86 + getTodoTaskPage(this.queryParams).then(response => {
89 87 this.list = response.data.list;
90 88 this.total = response.data.total;
91 89 this.loading = false;
... ... @@ -98,7 +96,6 @@ export default {
98 96 },
99 97 /** 重置按钮操作 */
100 98 resetQuery() {
101   - this.dateRangeCreateTime = [];
102 99 this.resetForm("queryForm");
103 100 this.handleQuery();
104 101 },
... ...
yudao-ui-admin/src/views/infra/apiAccessLog/index.vue
  View file @26f684e
... ... @@ -18,9 +18,9 @@
18 18 <el-form-item label="请求地址" prop="requestUrl">
19 19 <el-input v-model="queryParams.requestUrl" placeholder="请输入请求地址" clearable @keyup.enter.native="handleQuery"/>
20 20 </el-form-item>
21   - <el-form-item label="请求时间">
22   - <el-date-picker v-model="dateRangeBeginTime" style="width: 240px" value-format="yyyy-MM-dd"
23   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  21 + <el-form-item label="请求时间" prop="beginTime">
  22 + <el-date-picker v-model="queryParams.beginTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  23 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
24 24 </el-form-item>
25 25 <el-form-item label="执行时长" prop="duration">
26 26 <el-input v-model="queryParams.duration" placeholder="请输入执行时长" clearable @keyup.enter.native="handleQuery"/>
... ... @@ -135,7 +135,6 @@ export default {
135 135 title: "",
136 136 // 是否显示弹出层
137 137 open: false,
138   - dateRangeBeginTime: [],
139 138 // 查询参数
140 139 queryParams: {
141 140 pageNo: 1,
... ... @@ -146,6 +145,7 @@ export default {
146 145 requestUrl: null,
147 146 duration: null,
148 147 resultCode: null,
  148 + beginTime: []
149 149 },
150 150 // 表单参数
151 151 form: {},
... ... @@ -158,11 +158,8 @@ export default {
158 158 /** 查询列表 */
159 159 getList() {
160 160 this.loading = true;
161   - // 处理查询参数
162   - let params = {...this.queryParams};
163   - this.addBeginAndEndTime(params, this.dateRangeBeginTime, 'beginTime');
164 161 // 执行查询
165   - getApiAccessLogPage(params).then(response => {
  162 + getApiAccessLogPage(this.queryParams).then(response => {
166 163 this.list = response.data.list;
167 164 this.total = response.data.total;
168 165 this.loading = false;
... ... @@ -185,7 +182,6 @@ export default {
185 182 },
186 183 /** 重置按钮操作 */
187 184 resetQuery() {
188   - this.dateRangeBeginTime = [];
189 185 this.resetForm("queryForm");
190 186 this.handleQuery();
191 187 },
... ... @@ -200,7 +196,6 @@ export default {
200 196 let params = {...this.queryParams};
201 197 params.pageNo = undefined;
202 198 params.pageSize = undefined;
203   - this.addBeginAndEndTime(params, this.dateRangeBeginTime, 'beginTime');
204 199 // 执行导出
205 200 this.$modal.confirm('是否确认导出所有API 访问日志数据项?').then(() => {
206 201 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/infra/apiErrorLog/index.vue
  View file @26f684e
... ... @@ -18,9 +18,9 @@
18 18 <el-form-item label="请求地址" prop="requestUrl">
19 19 <el-input v-model="queryParams.requestUrl" placeholder="请输入请求地址" clearable @keyup.enter.native="handleQuery"/>
20 20 </el-form-item>
21   - <el-form-item label="异常时间">
22   - <el-date-picker v-model="dateRangeExceptionTime" style="width: 240px" value-format="yyyy-MM-dd"
23   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  21 + <el-form-item label="异常时间" prop="exceptionTime">
  22 + <el-date-picker v-model="queryParams.exceptionTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  23 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
24 24 </el-form-item>
25 25 <el-form-item label="处理状态" prop="processStatus">
26 26 <el-select v-model="queryParams.processStatus" placeholder="请选择处理状态" clearable>
... ... @@ -142,7 +142,6 @@ export default {
142 142 title: "",
143 143 // 是否显示弹出层
144 144 open: false,
145   - dateRangeExceptionTime: [],
146 145 // 查询参数
147 146 queryParams: {
148 147 pageNo: 1,
... ... @@ -152,6 +151,7 @@ export default {
152 151 applicationName: null,
153 152 requestUrl: null,
154 153 processStatus: null,
  154 + exceptionTime: []
155 155 },
156 156 // 表单参数
157 157 form: {},
... ... @@ -166,11 +166,8 @@ export default {
166 166 /** 查询列表 */
167 167 getList() {
168 168 this.loading = true;
169   - // 处理查询参数
170   - let params = {...this.queryParams};
171   - this.addBeginAndEndTime(params, this.dateRangeExceptionTime, 'exceptionTime');
172 169 // 执行查询
173   - getApiErrorLogPage(params).then(response => {
  170 + getApiErrorLogPage(this.queryParams).then(response => {
174 171 this.list = response.data.list;
175 172 this.total = response.data.total;
176 173 this.loading = false;
... ... @@ -193,7 +190,6 @@ export default {
193 190 },
194 191 /** 重置按钮操作 */
195 192 resetQuery() {
196   - this.dateRangeExceptionTime = [];
197 193 this.resetForm("queryForm");
198 194 this.handleQuery();
199 195 },
... ... @@ -218,7 +214,6 @@ export default {
218 214 let params = {...this.queryParams};
219 215 params.pageNo = undefined;
220 216 params.pageSize = undefined;
221   - this.addBeginAndEndTime(params, this.dateRangeExceptionTime, 'exceptionTime');
222 217 // 执行导出
223 218 this.$modal.confirm('是否确认导出所有API 错误日志数据项?').then(() => {
224 219 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/infra/codegen/index.vue
  View file @26f684e
... ... @@ -12,9 +12,9 @@
12 12 <el-input v-model="queryParams.tableComment" placeholder="请输入表描述" clearable
13 13 @keyup.enter.native="handleQuery"/>
14 14 </el-form-item>
15   - <el-form-item label="创建时间">
16   - <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
17   - range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
18 18 </el-form-item>
19 19 <el-form-item>
20 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -123,7 +123,8 @@ export default {
123 123 pageNo: 1,
124 124 pageSize: 10,
125 125 tableName: undefined,
126   - tableComment: undefined
  126 + tableComment: undefined,
  127 + createTime: []
127 128 },
128 129 // 预览参数
129 130 preview: {
... ... @@ -155,10 +156,7 @@ export default {
155 156 /** 查询表集合 */
156 157 getList() {
157 158 this.loading = true;
158   - getCodegenTablePage(this.addDateRange(this.queryParams, [
159   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
160   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
161   - ], 'CreateTime')).then(response => {
  159 + getCodegenTablePage(this.queryParams).then(response => {
162 160 this.tableList = response.data.list;
163 161 this.total = response.data.total;
164 162 this.loading = false;
... ... @@ -192,7 +190,6 @@ export default {
192 190 },
193 191 /** 重置按钮操作 */
194 192 resetQuery() {
195   - this.dateRange = [];
196 193 this.resetForm("queryForm");
197 194 this.handleQuery();
198 195 },
... ...
yudao-ui-admin/src/views/infra/config/index.vue
  View file @26f684e
... ... @@ -17,9 +17,9 @@
17 17 :label="dict.label" :value="parseInt(dict.value)"/>
18 18 </el-select>
19 19 </el-form-item>
20   - <el-form-item label="创建时间">
21   - <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
22   - range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  20 + <el-form-item label="创建时间" prop="createTime">
  21 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  22 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
23 23 </el-form-item>
24 24 <el-form-item>
25 25 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -129,15 +129,14 @@ export default {
129 129 open: false,
130 130 // 类型数据字典
131 131 typeOptions: [],
132   - // 日期范围
133   - dateRange: [],
134 132 // 查询参数
135 133 queryParams: {
136 134 pageNo: 1,
137 135 pageSize: 10,
138 136 name: undefined,
139 137 key: undefined,
140   - type: undefined
  138 + type: undefined,
  139 + createTime: []
141 140 },
142 141 // 表单参数
143 142 form: {},
... ... @@ -165,10 +164,7 @@ export default {
165 164 /** 查询参数列表 */
166 165 getList() {
167 166 this.loading = true;
168   - listConfig(this.addDateRange(this.queryParams, [
169   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
170   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
171   - ])).then(response => {
  167 + listConfig(this.queryParams).then(response => {
172 168 this.configList = response.data.list;
173 169 this.total = response.data.total;
174 170 this.loading = false;
... ... @@ -198,7 +194,6 @@ export default {
198 194 },
199 195 /** 重置按钮操作 */
200 196 resetQuery() {
201   - this.dateRange = [];
202 197 this.resetForm("queryForm");
203 198 this.handleQuery();
204 199 },
... ... @@ -250,13 +245,13 @@ export default {
250 245 },
251 246 /** 导出按钮操作 */
252 247 handleExport() {
253   - const queryParams = this.addDateRange(this.queryParams, [
254   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
255   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
256   - ]);
257 248 this.$modal.confirm('是否确认导出所有参数数据项?').then(() => {
  249 + // 处理查询参数
  250 + let params = {...this.queryParams};
  251 + params.pageNo = undefined;
  252 + params.pageSize = undefined;
258 253 this.exportLoading = true;
259   - return exportConfig(queryParams);
  254 + return exportConfig(params);
260 255 }).then(response => {
261 256 this.$download.excel(response, '参数配置.xls');
262 257 this.exportLoading = false;
... ...
yudao-ui-admin/src/views/infra/file/index.vue
  View file @26f684e
... ... @@ -6,9 +6,9 @@
6 6 <el-form-item label="文件路径" prop="path">
7 7 <el-input v-model="queryParams.path" placeholder="请输入文件路径" clearable @keyup.enter.native="handleQuery"/>
8 8 </el-form-item>
9   - <el-form-item label="创建时间">
10   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
11   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  9 + <el-form-item label="创建时间" prop="createTime">
  10 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  11 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
12 12 </el-form-item>
13 13 <el-form-item>
14 14 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -104,13 +104,13 @@ export default {
104 104 list: [],
105 105 // 弹出层标题
106 106 title: "",
107   - dateRangeCreateTime: [],
108 107 // 查询参数
109 108 queryParams: {
110 109 pageNo: 1,
111 110 pageSize: 10,
112 111 path: null,
113 112 type: null,
  113 + createTime: []
114 114 },
115 115 // 用户导入参数
116 116 upload: {
... ... @@ -130,9 +130,6 @@ export default {
130 130 /** 查询列表 */
131 131 getList() {
132 132 this.loading = true;
133   - // 处理查询参数
134   - let params = {...this.queryParams};
135   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
136 133 // 执行查询
137 134 getFilePage(params).then(response => {
138 135 this.list = response.data.list;
... ... @@ -159,7 +156,6 @@ export default {
159 156 },
160 157 /** 重置按钮操作 */
161 158 resetQuery() {
162   - this.dateRangeCreateTime = [];
163 159 this.resetForm("queryForm");
164 160 this.handleQuery();
165 161 },
... ...
yudao-ui-admin/src/views/infra/fileConfig/index.vue
  View file @26f684e
... ... @@ -12,9 +12,9 @@
12 12 :key="dict.value" :label="dict.label" :value="dict.value"/>
13 13 </el-select>
14 14 </el-form-item>
15   - <el-form-item label="创建时间">
16   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
17   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
18 18 </el-form-item>
19 19 <el-form-item>
20 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -162,13 +162,13 @@ export default {
162 162 title: "",
163 163 // 是否显示弹出层
164 164 open: false,
165   - dateRangeCreateTime: [],
166 165 // 查询参数
167 166 queryParams: {
168 167 pageNo: 1,
169 168 pageSize: 10,
170 169 name: null,
171 170 storage: null,
  171 + createTime: []
172 172 },
173 173 // 表单参数
174 174 form: {
... ... @@ -202,11 +202,8 @@ export default {
202 202 /** 查询列表 */
203 203 getList() {
204 204 this.loading = true;
205   - // 处理查询参数
206   - let params = {...this.queryParams};
207   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
208 205 // 执行查询
209   - getFileConfigPage(params).then(response => {
  206 + getFileConfigPage(this.queryParams).then(response => {
210 207 this.list = response.data.list;
211 208 this.total = response.data.total;
212 209 this.loading = false;
... ... @@ -235,7 +232,6 @@ export default {
235 232 },
236 233 /** 重置按钮操作 */
237 234 resetQuery() {
238   - this.dateRangeCreateTime = [];
239 235 this.resetForm("queryForm");
240 236 this.handleQuery();
241 237 },
... ...
yudao-ui-admin/src/views/infra/testDemo/index.vue
  View file @26f684e
... ... @@ -22,9 +22,9 @@
22 22 <el-form-item label="备注" prop="remark">
23 23 <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
24 24 </el-form-item>
25   - <el-form-item label="创建时间">
26   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
27   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  25 + <el-form-item label="创建时间" prop="createTime">
  26 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  27 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
28 28 </el-form-item>
29 29 <el-form-item>
30 30 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -125,7 +125,6 @@ export default {
125 125 title: "",
126 126 // 是否显示弹出层
127 127 open: false,
128   - dateRangeCreateTime: [],
129 128 // 查询参数
130 129 queryParams: {
131 130 pageNo: 1,
... ... @@ -135,6 +134,7 @@ export default {
135 134 type: null,
136 135 category: null,
137 136 remark: null,
  137 + createTime: []
138 138 },
139 139 // 表单参数
140 140 form: {},
... ... @@ -154,11 +154,8 @@ export default {
154 154 /** 查询列表 */
155 155 getList() {
156 156 this.loading = true;
157   - // 处理查询参数
158   - let params = {...this.queryParams};
159   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
160 157 // 执行查询
161   - getTestDemoPage(params).then(response => {
  158 + getTestDemoPage(this.queryParams).then(response => {
162 159 this.list = response.data.list;
163 160 this.total = response.data.total;
164 161 this.loading = false;
... ... @@ -188,7 +185,6 @@ export default {
188 185 },
189 186 /** 重置按钮操作 */
190 187 resetQuery() {
191   - this.dateRangeCreateTime = [];
192 188 this.resetForm("queryForm");
193 189 this.handleQuery();
194 190 },
... ... @@ -247,7 +243,6 @@ export default {
247 243 let params = {...this.queryParams};
248 244 params.pageNo = undefined;
249 245 params.pageSize = undefined;
250   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
251 246 // 执行导出
252 247 this.$modal.confirm('是否确认导出所有字典类型数据项?').then(() => {
253 248 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/login.vue
  View file @26f684e
... ... @@ -106,7 +106,6 @@
106 106 <script>
107 107 import {getCodeImg, sendSmsCode, socialAuthRedirect} from "@/api/login";
108 108 import {getTenantIdByName} from "@/api/system/tenant";
109   -import Cookies from "js-cookie";
110 109 import {SystemUserSocialTypeEnum} from "@/utils/constants";
111 110 import {getTenantEnable} from "@/utils/ruoyi";
112 111 import {
... ... @@ -152,7 +151,7 @@ export default {
152 151 {required: true, trigger: "blur", message: "手机号不能为空"},
153 152 {
154 153 validator: function (rule, value, callback) {
155   - if (/^1[0-9]\d{9}$/.test(value) == false) {
  154 + if (/^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/.test(value) === false) {
156 155 callback(new Error("手机号格式错误"));
157 156 } else {
158 157 callback();
... ...
yudao-ui-admin/src/views/mall/market/banner/index.vue
  View file @26f684e
... ... @@ -12,9 +12,9 @@
12 12 :key="dict.value" :label="dict.label" :value="dict.value"/>
13 13 </el-select>
14 14 </el-form-item>
15   - <el-form-item label="创建时间">
16   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
17   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
18 18 </el-form-item>
19 19 <el-form-item>
20 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -135,13 +135,13 @@ export default {
135 135 title: "",
136 136 // 是否显示弹出层
137 137 open: false,
138   - dateRangeCreateTime: [],
139 138 // 查询参数
140 139 queryParams: {
141 140 pageNo: 1,
142 141 pageSize: 10,
143 142 title: null,
144 143 status: null,
  144 + createTime: []
145 145 },
146 146 // 商品分类树选项
147 147 categoryOptions: [],
... ... @@ -164,9 +164,6 @@ export default {
164 164 /** 查询列表 */
165 165 getList() {
166 166 this.loading = true;
167   - // 处理查询参数
168   - let params = {...this.queryParams};
169   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
170 167 // 执行查询
171 168 getBannerPage(params).then(response => {
172 169 this.list = response.data.list;
... ... @@ -199,7 +196,6 @@ export default {
199 196 },
200 197 /** 重置按钮操作 */
201 198 resetQuery() {
202   - this.dateRangeCreateTime = [];
203 199 this.resetForm("queryForm");
204 200 this.handleQuery();
205 201 },
... ...
yudao-ui-admin/src/views/mall/product/brand/index.vue
  View file @26f684e
... ... @@ -12,9 +12,9 @@
12 12 :key="dict.value" :label="dict.label" :value="dict.value"/>
13 13 </el-select>
14 14 </el-form-item>
15   - <el-form-item label="创建时间">
16   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
17   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
18 18 </el-form-item>
19 19 <el-form-item>
20 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -144,7 +144,6 @@ export default {
144 144 title: "",
145 145 // 是否显示弹出层
146 146 open: false,
147   - dateRangeCreateTime: [],
148 147 // 查询参数
149 148 queryParams: {
150 149 pageNo: 1,
... ... @@ -152,6 +151,7 @@ export default {
152 151 categoryId: null,
153 152 name: null,
154 153 status: null,
  154 + createTime: []
155 155 },
156 156 // 商品分类树选项
157 157 categoryOptions: [],
... ... @@ -174,11 +174,8 @@ export default {
174 174 /** 查询列表 */
175 175 getList() {
176 176 this.loading = true;
177   - // 处理查询参数
178   - let params = {...this.queryParams};
179   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
180 177 // 执行查询
181   - getBrandPage(params).then(response => {
  178 + getBrandPage(this.queryParams).then(response => {
182 179 this.list = response.data.list;
183 180 this.total = response.data.total;
184 181 this.loading = false;
... ... @@ -229,7 +226,6 @@ export default {
229 226 },
230 227 /** 重置按钮操作 */
231 228 resetQuery() {
232   - this.dateRangeCreateTime = [];
233 229 this.resetForm("queryForm");
234 230 this.handleQuery();
235 231 },
... ... @@ -291,7 +287,6 @@ export default {
291 287 let params = {...this.queryParams};
292 288 params.pageNo = undefined;
293 289 params.pageSize = undefined;
294   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
295 290 // 执行导出
296 291 this.$modal.confirm('是否确认导出所有品牌数据项?').then(() => {
297 292 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/mall/product/property/index.vue
  View file @26f684e
... ... @@ -12,6 +12,10 @@
12 12 :key="dict.value" :label="dict.label" :value="dict.value"/>
13 13 </el-select>
14 14 </el-form-item>
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
  18 + </el-form-item>
15 19 <el-form-item>
16 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
17 21 <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
... ... @@ -123,13 +127,13 @@ export default {
123 127 title: "",
124 128 // 是否显示弹出层
125 129 open: false,
126   - dateRangeCreateTime: [],
127 130 // 查询参数
128 131 queryParams: {
129 132 pageNo: 1,
130 133 pageSize: 10,
131 134 name: null,
132 135 status: null,
  136 + createTime: []
133 137 },
134 138 // 表单参数
135 139 form: {
... ... @@ -151,11 +155,8 @@ export default {
151 155 /** 查询列表 */
152 156 getList() {
153 157 this.loading = true;
154   - // 处理查询参数
155   - let params = {...this.queryParams};
156   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
157 158 // 执行查询
158   - getPropertyPage(params).then(response => {
  159 + getPropertyPage(this.queryParams).then(response => {
159 160 this.list = response.data.list;
160 161 this.total = response.data.total;
161 162 this.loading = false;
... ... @@ -185,7 +186,6 @@ export default {
185 186 },
186 187 /** 重置按钮操作 */
187 188 resetQuery() {
188   - this.dateRangeCreateTime = [];
189 189 this.resetForm("queryForm");
190 190 this.handleQuery();
191 191 },
... ... @@ -244,7 +244,6 @@ export default {
244 244 let params = {...this.queryParams};
245 245 params.pageNo = undefined;
246 246 params.pageSize = undefined;
247   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
248 247 // 执行导出
249 248 this.$modal.confirm('是否确认导出所有规格名称数据项?').then(() => {
250 249 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/mall/product/spu/index.vue
  View file @26f684e
... ... @@ -25,9 +25,9 @@
25 25 <el-option label="下架" value="1"/>
26 26 </el-select>
27 27 </el-form-item>
28   - <el-form-item label="创建时间">
29   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
30   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
  28 + <el-form-item label="创建时间" prop="createTime">
  29 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  30 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
31 31 </el-form-item>
32 32 <el-form-item>
33 33 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -193,7 +193,7 @@
193 193 label="条形码"
194 194 width="250" v-if="skuTags.length">
195 195 <template slot-scope="scope">
196   - <el-input v-model="scope.row.barCode" type="textarea" :disabled="scope.row.status==1"></el-input>
  196 + <el-input v-model="scope.row.barCode" type="textarea" :disabled="scope.row.status===1"></el-input>
197 197 </template>
198 198 </el-table-column>
199 199 <el-table-column
... ... @@ -207,7 +207,7 @@
207 207 :precision="2"
208 208 :max="1000000000"
209 209 :min="0.01"
210   - :disabled="scope.row.status==1">
  210 + :disabled="scope.row.status===1">
211 211 </el-input-number>
212 212 </template>
213 213 </el-table-column>
... ... @@ -222,7 +222,7 @@
222 222 :precision="2"
223 223 :max="1000000000"
224 224 :min="0.01"
225   - :disabled="scope.row.status==1">
  225 + :disabled="scope.row.status===1">
226 226 </el-input-number>
227 227 </template>
228 228 </el-table-column>
... ... @@ -237,7 +237,7 @@
237 237 :precision="2"
238 238 :max="1000000000"
239 239 :min="0.01"
240   - :disabled="scope.row.status==1">
  240 + :disabled="scope.row.status===1">
241 241 </el-input-number>
242 242 </template>
243 243 </el-table-column>
... ... @@ -341,7 +341,6 @@
341 341 title: "",
342 342 // 是否显示弹出层
343 343 open: false,
344   - dateRangeCreateTime: [],
345 344 // 查询参数
346 345 queryParams: {
347 346 pageNo: 1,
... ... @@ -356,6 +355,7 @@
356 355 price: null,
357 356 quantity: null,
358 357 status: null,
  358 + createTime: []
359 359 },
360 360 // 表单参数
361 361 form: {
... ... @@ -398,7 +398,7 @@
398 398  
399 399 },
400 400 changeSkuStatus(tagIndex) {
401   - if(this.form.skus[tagIndex].status == 0){
  401 + if(this.form.skus[tagIndex].status === 0){
402 402 this.form.skus[tagIndex].status = 1 ;
403 403 }else {
404 404 this.form.skus[tagIndex].status = 0 ;
... ... @@ -426,11 +426,9 @@
426 426 this.$emit('input', skuList)
427 427 },
428 428 handleTagClose(tagIndex, tagItemIndex) {
429   -
430 429 },
431 430 //确定添加sku规格
432 431 addTag() {
433   -
434 432 let skus = this.unUseTags.map(function (item, index) {
435 433 return item.name
436 434 });
... ... @@ -572,9 +570,6 @@
572 570 /** 查询列表 */
573 571 getList() {
574 572 this.loading = true;
575   - // 处理查询参数
576   - let params = {...this.queryParams};
577   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
578 573 // 执行查询
579 574 getSpuPage(params).then(response => {
580 575 this.list = response.data.list;
... ... @@ -631,8 +626,7 @@
631 626 /** 修改按钮操作 */
632 627 handleUpdate(row) {
633 628 this.reset();
634   - const id = row.id;
635   - getSpu(id).then(response => {
  629 + getSpu(row.id).then(response => {
636 630 console.log(">>>>>> response.data:" + JSON.stringify(response.data))
637 631 let dataSpu = response.data;
638 632 this.form = {
... ... @@ -660,7 +654,6 @@
660 654 /** 提交按钮 */
661 655 submitForm() {
662 656 console.log(this.form.picUrls.split(','));
663   -
664 657 this.$refs["form"].validate(valid => {
665 658 if (!valid) {
666 659 return;
... ... @@ -702,7 +695,6 @@
702 695 let params = {...this.queryParams};
703 696 params.pageNo = undefined;
704 697 params.pageSize = undefined;
705   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
706 698 // 执行导出
707 699 this.$modal.confirm('是否确认导出所有商品spu数据项?').then(() => {
708 700 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/pay/app/index.vue
  View file @26f684e
... ... @@ -17,6 +17,10 @@
17 17 :value="parseInt(dict.value)"/>
18 18 </el-select>
19 19 </el-form-item>
  20 + <el-form-item label="创建时间" prop="createTime">
  21 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  22 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
  23 + </el-form-item>
20 24 <el-form-item>
21 25 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
22 26 <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
... ... @@ -237,7 +241,6 @@ export default {
237 241 title: "",
238 242 // 是否显示弹出层
239 243 open: false,
240   - dateRangeCreateTime: [],
241 244 // 查询参数
242 245 queryParams: {
243 246 pageNo: 1,
... ... @@ -248,6 +251,7 @@ export default {
248 251 payNotifyUrl: null,
249 252 refundNotifyUrl: null,
250 253 merchantName: null,
  254 + createTime: []
251 255 },
252 256 // 表单参数
253 257 form: {},
... ... @@ -300,13 +304,9 @@ export default {
300 304 /** 查询列表 */
301 305 getList() {
302 306 this.loading = true;
303   - // 处理查询参数
304   - let params = {...this.queryParams};
305   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
306 307 // 执行查询
307   - getAppPage(params).then(response => {
  308 + getAppPage(this.queryParams).then(response => {
308 309 this.list = response.data.list;
309   - console.log(this.list);
310 310 this.total = response.data.total;
311 311 this.loading = false;
312 312 });
... ... @@ -336,7 +336,6 @@ export default {
336 336 },
337 337 /** 重置按钮操作 */
338 338 resetQuery() {
339   - this.dateRangeCreateTime = [];
340 339 this.resetForm("queryForm");
341 340 this.handleQuery();
342 341 },
... ... @@ -393,9 +392,8 @@ export default {
393 392 },
394 393 /** 删除按钮操作 */
395 394 handleDelete(row) {
396   - const id = row.id;
397   - this.$modal.confirm('是否确认删除支付应用信息编号为"' + id + '"的数据项?').then(function () {
398   - return deleteApp(id);
  395 + this.$modal.confirm('是否确认删除支付应用信息编号为"' + row.id + '"的数据项?').then(function () {
  396 + return deleteApp(row.id);
399 397 }).then(() => {
400 398 this.getList();
401 399 this.$modal.msgSuccess("删除成功");
... ... @@ -412,7 +410,6 @@ export default {
412 410 let params = {...this.queryParams};
413 411 params.pageNo = undefined;
414 412 params.pageSize = undefined;
415   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
416 413 // 执行导出
417 414 this.$modal.confirm('是否确认导出所有支付应用信息数据项?').then(function () {
418 415 return exportAppExcel(params);
... ...
yudao-ui-admin/src/views/pay/merchant/index.vue
  View file @26f684e
... ... @@ -20,9 +20,9 @@
20 20 <el-form-item label="备注" prop="remark">
21 21 <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
22 22 </el-form-item>
23   - <el-form-item label="创建时间">
24   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
25   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  23 + <el-form-item label="创建时间" prop="createTime">
  24 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  25 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
26 26 </el-form-item>
27 27 <el-form-item>
28 28 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -136,7 +136,6 @@ export default {
136 136 title: "",
137 137 // 是否显示弹出层
138 138 open: false,
139   - dateRangeCreateTime: [],
140 139 // 查询参数
141 140 queryParams: {
142 141 pageNo: 1,
... ... @@ -146,6 +145,7 @@ export default {
146 145 shortName: null,
147 146 status: null,
148 147 remark: null,
  148 + createTime: []
149 149 },
150 150 // 表单参数
151 151 form: {},
... ... @@ -167,11 +167,8 @@ export default {
167 167 /** 查询列表 */
168 168 getList() {
169 169 this.loading = true;
170   - // 处理查询参数
171   - let params = {...this.queryParams};
172   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
173 170 // 执行查询
174   - getMerchantPage(params).then(response => {
  171 + getMerchantPage(this.queryParams).then(response => {
175 172 console.log(response.data);
176 173 this.list = response.data.list;
177 174 this.total = response.data.total;
... ... @@ -202,7 +199,6 @@ export default {
202 199 },
203 200 /** 重置按钮操作 */
204 201 resetQuery() {
205   - this.dateRangeCreateTime = [];
206 202 this.resetForm("queryForm");
207 203 this.handleQuery();
208 204 },
... ... @@ -215,8 +211,7 @@ export default {
215 211 /** 修改按钮操作 */
216 212 handleUpdate(row) {
217 213 this.reset();
218   - const id = row.id;
219   - getMerchant(id).then(response => {
  214 + getMerchant(row.id).then(response => {
220 215 this.form = response.data;
221 216 this.open = true;
222 217 this.title = "修改支付商户信息";
... ... @@ -273,7 +268,6 @@ export default {
273 268 let params = {...this.queryParams};
274 269 params.pageNo = undefined;
275 270 params.pageSize = undefined;
276   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
277 271 // 执行导出
278 272 this.$modal.confirm('是否确认导出所有支付商户信息数据项?').then(() => {
279 273 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/pay/order/index.vue
  View file @26f684e
... ... @@ -47,12 +47,9 @@
47 47 :label="dict.label" :value="parseInt(dict.value)"/>
48 48 </el-select>
49 49 </el-form-item>
50   - <el-form-item label="创建时间">
51   - <el-date-picker
52   - v-model="dateRangeCreateTime" style="width: 350px"
53   - value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-"
54   - :default-time="['00:00:00','23:59:59']" start-placeholder="开始日期" end-placeholder="结束日期">
55   - </el-date-picker>
  50 + <el-form-item label="创建时间" prop="createTime">
  51 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  52 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
56 53 </el-form-item>
57 54 <el-form-item>
58 55 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -270,10 +267,6 @@ export default {
270 267 title: "",
271 268 // 是否显示弹出层
272 269 open: false,
273   - dateRangeExpireTime: [],
274   - dateRangeSuccessTime: [],
275   - dateRangeNotifyTime: [],
276   - dateRangeCreateTime: [],
277 270 // 查询参数
278 271 queryParams: {
279 272 pageNo: 1,
... ... @@ -298,6 +291,10 @@ export default {
298 291 refundAmount: null,
299 292 channelUserId: null,
300 293 channelOrderNo: null,
  294 + expireTime: [],
  295 + successTime: [],
  296 + notifyTime: [],
  297 + createTime: []
301 298 },
302 299 // 商户加载遮罩层
303 300 merchantLoading: false,
... ... @@ -324,32 +321,25 @@ export default {
324 321 },
325 322 methods: {
326 323 initTime(){
327   - this.dateRangeCreateTime = [getNowDateTime("00:00:00"), getNowDateTime("23:59:59")];
  324 + this.queryParams.createTime = [getNowDateTime("00:00:00"), getNowDateTime("23:59:59")];
328 325 },
329 326 /** 查询列表 */
330 327 getList() {
331 328 // 判断选择的日期是否超过了一个月
332 329 let oneMonthTime = 31 * 24 * 3600 * 1000;
333   - if (this.dateRangeCreateTime == null){
  330 + if (this.queryParams.createTime == null){
334 331 this.initTime();
335 332 } else {
336   - let minDateTime = new Date(this.dateRangeCreateTime[0]).getTime();
337   - let maxDateTime = new Date(this.dateRangeCreateTime[1]).getTime()
  333 + let minDateTime = new Date(this.queryParams.createTime[0]).getTime();
  334 + let maxDateTime = new Date(this.queryParams.createTime[1]).getTime()
338 335 if (maxDateTime - minDateTime > oneMonthTime) {
339 336 this.$message.error('时间范围最大为 31 天！');
340 337 return false;
341 338 }
342 339 }
343   -
344 340 this.loading = true;
345   - // 处理查询参数
346   - let params = {...this.queryParams};
347   - this.addBeginAndEndTime(params, this.dateRangeExpireTime, 'expireTime');
348   - this.addBeginAndEndTime(params, this.dateRangeSuccessTime, 'successTime');
349   - this.addBeginAndEndTime(params, this.dateRangeNotifyTime, 'notifyTime');
350   - this.addDateRange(params, this.dateRangeCreateTime, 'CreateTime');
351 341 // 执行查询
352   - getOrderPage(params).then(response => {
  342 + getOrderPage(this.queryParams).then(response => {
353 343 this.list = response.data.list;
354 344 this.total = response.data.total;
355 345 this.loading = false;
... ... @@ -366,9 +356,6 @@ export default {
366 356 },
367 357 /** 重置按钮操作 */
368 358 resetQuery() {
369   - this.dateRangeSuccessTime = [];
370   - this.dateRangeNotifyTime = [];
371   - this.dateRangeExpireTime = [];
372 359 this.resetForm("queryForm");
373 360 this.initTime();
374 361 this.handleQuery();
... ... @@ -393,10 +380,6 @@ export default {
393 380 let params = {...this.queryParams};
394 381 params.pageNo = undefined;
395 382 params.pageSize = undefined;
396   - this.addBeginAndEndTime(params, this.dateRangeExpireTime, 'expireTime');
397   - this.addBeginAndEndTime(params, this.dateRangeSuccessTime, 'successTime');
398   - this.addBeginAndEndTime(params, this.dateRangeNotifyTime, 'notifyTime');
399   - this.addDateRange(params, this.dateRangeCreateTime, 'CreateTime');
400 383 // 执行导出
401 384 this.$modal.confirm('是否确认导出所有支付订单数据项?').then(function () {
402 385 return exportOrderExcel(params);
... ...
yudao-ui-admin/src/views/pay/refund/index.vue
  View file @26f684e
1 1 <template>
2 2 <div class="app-container">
3   -
4 3 <!-- 搜索工作栏 -->
5 4 <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
6 5 <el-form-item label="所属商户" prop="merchantId">
... ... @@ -31,26 +30,21 @@
31 30 <el-input v-model="queryParams.merchantRefundNo" placeholder="请输入商户退款订单号" clearable
32 31 @keyup.enter.native="handleQuery"/>
33 32 </el-form-item>
34   -
35 33 <el-form-item label="退款状态" prop="status">
36 34 <el-select v-model="queryParams.status" placeholder="请选择退款状态" clearable>
37 35 <el-option v-for="dict in payRefundOrderDictDatum" :key="parseInt(dict.value)"
38 36 :label="dict.label" :value="parseInt(dict.value)"/>
39 37 </el-select>
40 38 </el-form-item>
41   -
42 39 <el-form-item label="退款回调状态" prop="notifyStatus">
43 40 <el-select v-model="queryParams.notifyStatus" placeholder="请选择通知商户退款结果的回调状态" clearable>
44 41 <el-option v-for="dict in payOrderNotifyDictDatum" :key="parseInt(dict.value)"
45 42 :label="dict.label" :value="parseInt(dict.value)"/>
46 43 </el-select>
47 44 </el-form-item>
48   - <el-form-item label="创建时间">
49   - <el-date-picker
50   - v-model="dateRangeCreateTime" style="width: 350px"
51   - value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-"
52   - :default-time="['00:00:00','23:59:59']" start-placeholder="开始日期" end-placeholder="结束日期">
53   - </el-date-picker>
  45 + <el-form-item label="创建时间" prop="createTime">
  46 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  47 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
54 48 </el-form-item>
55 49 <el-form-item>
56 50 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -286,10 +280,6 @@ export default {
286 280 title: "",
287 281 // 是否显示弹出层
288 282 open: false,
289   - dateRangeExpireTime: [],
290   - dateRangeSuccessTime: [],
291   - dateRangeNotifyTime: [],
292   - dateRangeCreateTime: [],
293 283 // 查询参数
294 284 queryParams: {
295 285 pageNo: 1,
... ... @@ -315,6 +305,10 @@ export default {
315 305 channelErrorCode: null,
316 306 channelErrorMsg: null,
317 307 channelExtras: null,
  308 + expireTime: [],
  309 + successTime: [],
  310 + notifyTime: [],
  311 + createTime: []
318 312 },
319 313 // 商户加载遮罩层
320 314 merchantLoading: false,
... ... @@ -343,31 +337,25 @@ export default {
343 337 },
344 338 methods: {
345 339 initTime(){
346   - this.dateRangeCreateTime = [getNowDateTime("00:00:00"), getNowDateTime("23:59:59")];
  340 + this.queryParams.createTime = [getNowDateTime("00:00:00"), getNowDateTime("23:59:59")];
347 341 },
348 342 /** 查询列表 */
349 343 getList() {
350 344 // 判断选择的日期是否超过了一个月
351 345 let oneMonthTime = 31 * 24 * 3600 * 1000;
352   - if (this.dateRangeCreateTime == null){
  346 + if (this.queryParams.createTime == null){
353 347 this.initTime();
354 348 } else {
355   - let minDateTime = new Date(this.dateRangeCreateTime[0]).getTime();
356   - let maxDateTime = new Date(this.dateRangeCreateTime[1]).getTime()
  349 + let minDateTime = new Date(this.queryParams.createTime[0]).getTime();
  350 + let maxDateTime = new Date(this.queryParams.createTime[1]).getTime()
357 351 if (maxDateTime - minDateTime > oneMonthTime) {
358 352 this.$message.error('时间范围最大为 31 天！');
359 353 return false;
360 354 }
361 355 }
362 356 this.loading = true;
363   - // 处理查询参数
364   - let params = {...this.queryParams};
365   - this.addBeginAndEndTime(params, this.dateRangeExpireTime, 'expireTime');
366   - this.addBeginAndEndTime(params, this.dateRangeSuccessTime, 'successTime');
367   - this.addBeginAndEndTime(params, this.dateRangeNotifyTime, 'notifyTime');
368   - this.addDateRange(params, this.dateRangeCreateTime, 'CreateTime');
369 357 // 执行查询
370   - getRefundPage(params).then(response => {
  358 + getRefundPage(this.queryParams).then(response => {
371 359 this.list = response.data.list;
372 360 this.total = response.data.total;
373 361 this.loading = false;
... ... @@ -384,10 +372,6 @@ export default {
384 372 },
385 373 /** 重置按钮操作 */
386 374 resetQuery() {
387   - this.dateRangeExpireTime = [];
388   - this.dateRangeSuccessTime = [];
389   - this.dateRangeNotifyTime = [];
390   - this.dateRangeCreateTime = [];
391 375 this.resetForm("queryForm");
392 376 this.handleQuery();
393 377 },
... ... @@ -397,10 +381,6 @@ export default {
397 381 let params = {...this.queryParams};
398 382 params.pageNo = undefined;
399 383 params.pageSize = undefined;
400   - this.addBeginAndEndTime(params, this.dateRangeExpireTime, 'expireTime');
401   - this.addBeginAndEndTime(params, this.dateRangeSuccessTime, 'successTime');
402   - this.addBeginAndEndTime(params, this.dateRangeNotifyTime, 'notifyTime');
403   - this.addDateRange(params, this.dateRangeCreateTime, 'CreateTime');
404 384 // 执行导出
405 385 this.$modal.confirm('是否确认导出所有退款订单数据项?').then(function () {
406 386 return exportRefundExcel(params);
... ...
yudao-ui-admin/src/views/socialLogin.vue
  View file @26f684e
... ... @@ -63,8 +63,6 @@
63 63 </template>
64 64  
65 65 <script>
66   -import Cookies from "js-cookie";
67   -import { encrypt, decrypt } from '@/utils/jsencrypt'
68 66 import {
69 67 getPassword, getRememberMe,
70 68 getUsername,
... ...
yudao-ui-admin/src/views/system/dict/index.vue
  View file @26f684e
... ... @@ -12,9 +12,9 @@
12 12 <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
13 13 </el-select>
14 14 </el-form-item>
15   - <el-form-item label="创建时间">
16   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
17   - range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
18 18 </el-form-item>
19 19 <el-form-item>
20 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -120,15 +120,14 @@ export default {
120 120 open: false,
121 121 // 状态数据字典
122 122 statusOptions: [],
123   - // 日期范围
124   - dateRangeCreateTime: [],
125 123 // 查询参数
126 124 queryParams: {
127 125 pageNo: 1,
128 126 pageSize: 10,
129 127 name: undefined,
130 128 type: undefined,
131   - status: undefined
  129 + status: undefined,
  130 + createTime: []
132 131 },
133 132 // 表单参数
134 133 form: {},
... ... @@ -155,11 +154,8 @@ export default {
155 154 /** 查询字典类型列表 */
156 155 getList() {
157 156 this.loading = true;
158   - // 处理查询参数
159   - let params = {...this.queryParams};
160   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
161 157 // 执行查询
162   - listType(params).then(response => {
  158 + listType(this.queryParams).then(response => {
163 159 this.typeList = response.data.list;
164 160 this.total = response.data.total;
165 161 this.loading = false;
... ... @@ -188,7 +184,6 @@ export default {
188 184 },
189 185 /** 重置按钮操作 */
190 186 resetQuery() {
191   - this.dateRangeCreateTime = [];
192 187 this.resetForm("queryForm");
193 188 this.handleQuery();
194 189 },
... ... @@ -244,7 +239,6 @@ export default {
244 239 let params = {...this.queryParams};
245 240 params.pageNo = undefined;
246 241 params.pageSize = undefined;
247   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
248 242 // 执行导出
249 243 this.$modal.confirm('是否确认导出所有字典类型数据项?').then(() => {
250 244 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/system/errorCode/index.vue
  View file @26f684e
... ... @@ -18,9 +18,9 @@
18 18 <el-form-item label="错误码提示" prop="message">
19 19 <el-input v-model="queryParams.message" placeholder="请输入错误码提示" clearable @keyup.enter.native="handleQuery"/>
20 20 </el-form-item>
21   - <el-form-item label="创建时间">
22   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
23   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  21 + <el-form-item label="创建时间" prop="createTime">
  22 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  23 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
24 24 </el-form-item>
25 25 <el-form-item>
26 26 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -118,7 +118,6 @@ export default {
118 118 title: "",
119 119 // 是否显示弹出层
120 120 open: false,
121   - dateRangeCreateTime: [],
122 121 // 查询参数
123 122 queryParams: {
124 123 pageNo: 1,
... ... @@ -127,6 +126,7 @@ export default {
127 126 applicationName: null,
128 127 code: null,
129 128 message: null,
  129 + createTime: []
130 130 },
131 131 // 表单参数
132 132 form: {},
... ... @@ -145,11 +145,8 @@ export default {
145 145 /** 查询列表 */
146 146 getList() {
147 147 this.loading = true;
148   - // 处理查询参数
149   - let params = {...this.queryParams};
150   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
151 148 // 执行查询
152   - getErrorCodePage(params).then(response => {
  149 + getErrorCodePage(this.queryParams).then(response => {
153 150 this.list = response.data.list;
154 151 this.total = response.data.total;
155 152 this.loading = false;
... ... @@ -178,7 +175,6 @@ export default {
178 175 },
179 176 /** 重置按钮操作 */
180 177 resetQuery() {
181   - this.dateRangeCreateTime = [];
182 178 this.resetForm("queryForm");
183 179 this.handleQuery();
184 180 },
... ... @@ -237,7 +233,6 @@ export default {
237 233 let params = {...this.queryParams};
238 234 params.pageNo = undefined;
239 235 params.pageSize = undefined;
240   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
241 236 // 执行导出
242 237 this.$modal.confirm('是否确认导出所有错误码数据项?').then(() => {
243 238 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/system/loginlog/index.vue
  View file @26f684e
... ... @@ -17,9 +17,9 @@
17 17 <el-option :key="false" label="失败" :value="false"/>
18 18 </el-select>
19 19 </el-form-item>
20   - <el-form-item label="登录时间">
21   - <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd"
22   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
  20 + <el-form-item label="登录时间" prop="createTime">
  21 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  22 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
23 23 </el-form-item>
24 24 <el-form-item>
25 25 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -81,15 +81,14 @@ export default {
81 81 list: [],
82 82 // 状态数据字典
83 83 statusOptions: [],
84   - // 日期范围
85   - dateRange: [],
86 84 // 查询参数
87 85 queryParams: {
88 86 pageNo: 1,
89 87 pageSize: 10,
90 88 userIp: undefined,
91 89 username: undefined,
92   - status: undefined
  90 + status: undefined,
  91 + createTime: []
93 92 }
94 93 };
95 94 },
... ... @@ -100,10 +99,7 @@ export default {
100 99 /** 查询登录日志列表 */
101 100 getList() {
102 101 this.loading = true;
103   - list(this.addDateRange(this.queryParams, [
104   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
105   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
106   - ])).then(response => {
  102 + list(this.queryParams).then(response => {
107 103 this.list = response.data.list;
108 104 this.total = response.data.total;
109 105 this.loading = false;
... ... @@ -117,16 +113,18 @@ export default {
117 113 },
118 114 /** 重置按钮操作 */
119 115 resetQuery() {
120   - this.dateRange = [];
121 116 this.resetForm("queryForm");
122 117 this.handleQuery();
123 118 },
124 119 /** 导出按钮操作 */
125 120 handleExport() {
126   - const queryParams = this.queryParams;
127 121 this.$modal.confirm('是否确认导出所有操作日志数据项?').then(() => {
  122 + // 处理查询参数
  123 + let params = {...this.queryParams};
  124 + params.pageNo = undefined;
  125 + params.pageSize = undefined;
128 126 this.exportLoading = true;
129   - return exportLoginLog(queryParams);
  127 + return exportLoginLog(params);
130 128 }).then(response => {
131 129 this.$download.excel(response, '登录日志.xls');
132 130 this.exportLoading = false;
... ...
yudao-ui-admin/src/views/system/operatelog/index.vue
  View file @26f684e
... ... @@ -23,9 +23,9 @@
23 23 <el-option :key="false" label="失败" :value="false"/>
24 24 </el-select>
25 25 </el-form-item>
26   - <el-form-item label="操作时间">
27   - <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd"
28   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
  26 + <el-form-item label="操作时间" prop="startTime">
  27 + <el-date-picker v-model="queryParams.startTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  28 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
29 29 </el-form-item>
30 30 <el-form-item>
31 31 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -150,8 +150,6 @@ export default {
150 150 typeOptions: [],
151 151 // 类型数据字典
152 152 statusOptions: [],
153   - // 日期范围
154   - dateRange: [],
155 153 // 表单参数
156 154 form: {},
157 155 // 查询参数
... ... @@ -161,7 +159,8 @@ export default {
161 159 title: undefined,
162 160 operName: undefined,
163 161 businessType: undefined,
164   - status: undefined
  162 + status: undefined,
  163 + startTime: []
165 164 },
166 165 };
167 166 },
... ... @@ -172,10 +171,7 @@ export default {
172 171 /** 查询登录日志 */
173 172 getList() {
174 173 this.loading = true;
175   - listOperateLog(this.addDateRange(this.queryParams, [
176   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
177   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
178   - ])).then( response => {
  174 + listOperateLog(this.queryParams).then( response => {
179 175 this.list = response.data.list;
180 176 this.total = response.data.total;
181 177 this.loading = false;
... ... @@ -189,7 +185,6 @@ export default {
189 185 },
190 186 /** 重置按钮操作 */
191 187 resetQuery() {
192   - this.dateRange = [];
193 188 this.resetForm("queryForm");
194 189 this.handleQuery();
195 190 },
... ... @@ -200,13 +195,13 @@ export default {
200 195 },
201 196 /** 导出按钮操作 */
202 197 handleExport() {
203   - const queryParams = this.addDateRange(this.queryParams, [
204   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
205   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
206   - ])
207 198 this.$modal.confirm('是否确认导出所有操作日志数据项?').then(() => {
  199 + // 处理查询参数
  200 + let params = {...this.queryParams};
  201 + params.pageNo = undefined;
  202 + params.pageSize = undefined;
208 203 this.exportLoading = true;
209   - return exportOperateLog(queryParams);
  204 + return exportOperateLog(params);
210 205 }).then(response => {
211 206 this.$download.excel(response, '操作日志.xls');
212 207 this.exportLoading = false;
... ...
yudao-ui-admin/src/views/system/role/index.vue
  View file @26f684e
... ... @@ -16,9 +16,9 @@
16 16 <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
17 17 </el-select>
18 18 </el-form-item>
19   - <el-form-item label="创建时间">
20   - <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
21   - range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
  19 + <el-form-item label="创建时间" prop="createTime">
  20 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  21 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
22 22 </el-form-item>
23 23 <el-form-item>
24 24 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
... ... @@ -206,8 +206,6 @@ export default {
206 206 menuNodeAll: false,
207 207 deptExpand: true,
208 208 deptNodeAll: false,
209   - // 日期范围
210   - dateRange: [],
211 209 // 菜单列表
212 210 menuOptions: [],
213 211 // 部门列表
... ... @@ -219,7 +217,8 @@ export default {
219 217 pageSize: 10,
220 218 name: undefined,
221 219 code: undefined,
222   - status: undefined
  220 + status: undefined,
  221 + createTime: []
223 222 },
224 223 // 表单参数
225 224 form: {},
... ... @@ -256,10 +255,7 @@ export default {
256 255 /** 查询角色列表 */
257 256 getList() {
258 257 this.loading = true;
259   - listRole(this.addDateRange(this.queryParams, [
260   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
261   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
262   - ])).then(
  258 + listRole(this.queryParams).then(
263 259 response => {
264 260 this.roleList = response.data.list;
265 261 this.total = response.data.total;
... ... @@ -326,7 +322,6 @@ export default {
326 322 },
327 323 /** 重置按钮操作 */
328 324 resetQuery() {
329   - this.dateRange = [];
330 325 this.resetForm("queryForm");
331 326 this.handleQuery();
332 327 },
... ...
yudao-ui-admin/src/views/system/sensitiveWord/index.vue
  View file @26f684e
... ... @@ -16,9 +16,9 @@
16 16 :key="dict.value" :label="dict.label" :value="dict.value"/>
17 17 </el-select>
18 18 </el-form-item>
19   - <el-form-item label="创建时间">
20   - <el-date-picker v-model="dateRangeCreateTime" size="small" style="width: 240px" value-format="yyyy-MM-dd"
21   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"/>
  19 + <el-form-item label="创建时间" prop="createTime">
  20 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  21 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
22 22 </el-form-item>
23 23 <el-form-item>
24 24 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -150,7 +150,6 @@ export default {
150 150 // 是否显示弹出层
151 151 open: false,
152 152 testOpen: false,
153   - dateRangeCreateTime: [],
154 153 tags: [],
155 154 // 查询参数
156 155 queryParams: {
... ... @@ -158,6 +157,7 @@ export default {
158 157 pageSize: 10,
159 158 name: null,
160 159 tag: null,
  160 + createTime: []
161 161 },
162 162 // 表单参数
163 163 form: {},
... ... @@ -187,11 +187,8 @@ export default {
187 187 /** 查询列表 */
188 188 getList() {
189 189 this.loading = true;
190   - // 处理查询参数
191   - let params = {...this.queryParams};
192   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
193 190 // 执行查询
194   - getSensitiveWordPage(params).then(response => {
  191 + getSensitiveWordPage(this.queryParams).then(response => {
195 192 this.list = response.data.list;
196 193 this.total = response.data.total;
197 194 this.loading = false;
... ... @@ -232,7 +229,6 @@ export default {
232 229 },
233 230 /** 重置按钮操作 */
234 231 resetQuery() {
235   - this.dateRangeCreateTime = [];
236 232 this.resetForm("queryForm");
237 233 this.handleQuery();
238 234 },
... ... @@ -313,7 +309,6 @@ export default {
313 309 let params = {...this.queryParams};
314 310 params.pageNo = undefined;
315 311 params.pageSize = undefined;
316   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
317 312 // 执行导出
318 313 this.$modal.confirm('是否确认导出所有敏感词数据项?').then(() => {
319 314 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/system/sms/smsChannel.vue
  View file @26f684e
... ... @@ -12,9 +12,9 @@
12 12 :key="dict.value" :label="dict.label" :value="dict.value"/>
13 13 </el-select>
14 14 </el-form-item>
15   - <el-form-item label="创建时间">
16   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
17   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
18 18 </el-form-item>
19 19 <el-form-item>
20 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -128,13 +128,13 @@ export default {
128 128 title: "",
129 129 // 是否显示弹出层
130 130 open: false,
131   - dateRangeCreateTime: [],
132 131 // 查询参数
133 132 queryParams: {
134 133 pageNo: 1,
135 134 pageSize: 10,
136 135 signature: null,
137 136 status: null,
  137 + createTime: []
138 138 },
139 139 // 表单参数
140 140 form: {},
... ... @@ -154,11 +154,8 @@ export default {
154 154 /** 查询列表 */
155 155 getList() {
156 156 this.loading = true;
157   - // 处理查询参数
158   - let params = {...this.queryParams};
159   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
160 157 // 执行查询
161   - getSmsChannelPage(params).then(response => {
  158 + getSmsChannelPage(this.queryParams).then(response => {
162 159 this.list = response.data.list;
163 160 this.total = response.data.total;
164 161 this.loading = false;
... ... @@ -190,7 +187,6 @@ export default {
190 187 },
191 188 /** 重置按钮操作 */
192 189 resetQuery() {
193   - this.dateRangeCreateTime = [];
194 190 this.resetForm("queryForm");
195 191 this.handleQuery();
196 192 },
... ... @@ -235,8 +231,7 @@ export default {
235 231 },
236 232 /** 删除按钮操作 */
237 233 handleDelete(row) {
238   - const id = row.id;
239   - this.$modal.confirm('是否确认删除短信渠道编号为"' + id + '"的数据项?').then(function() {
  234 + this.$modal.confirm('是否确认删除短信渠道编号为"' + row.id + '"的数据项?').then(function() {
240 235 return deleteSmsChannel(id);
241 236 }).then(() => {
242 237 this.getList();
... ...
yudao-ui-admin/src/views/system/sms/smsLog.vue
  View file @26f684e
... ... @@ -22,9 +22,9 @@
22 22 :key="dict.value" :label="dict.label" :value="dict.value"/>
23 23 </el-select>
24 24 </el-form-item>
25   - <el-form-item label="发送时间">
26   - <el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd"
27   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  25 + <el-form-item label="发送时间" prop="sendTime">
  26 + <el-date-picker v-model="queryParams.sendTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  27 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
28 28 </el-form-item>
29 29 <el-form-item label="接收状态" prop="receiveStatus">
30 30 <el-select v-model="queryParams.receiveStatus" placeholder="请选择接收状态" clearable>
... ... @@ -32,9 +32,9 @@
32 32 :key="dict.value" :label="dict.label" :value="dict.value"/>
33 33 </el-select>
34 34 </el-form-item>
35   - <el-form-item label="接收时间">
36   - <el-date-picker v-model="dateRangeReceiveTime" style="width: 240px" value-format="yyyy-MM-dd"
37   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  35 + <el-form-item label="接收时间" prop="receiveTime">
  36 + <el-date-picker v-model="queryParams.receiveTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  37 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
38 38 </el-form-item>
39 39 <el-form-item>
40 40 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -208,8 +208,6 @@ export default {
208 208 title: "",
209 209 // 是否显示弹出层
210 210 open: false,
211   - dateRangeSendTime: [],
212   - dateRangeReceiveTime: [],
213 211 // 表单参数
214 212 form: {},
215 213 // 查询参数
... ... @@ -221,6 +219,8 @@ export default {
221 219 mobile: null,
222 220 sendStatus: null,
223 221 receiveStatus: null,
  222 + sendTime: [],
  223 + receiveTime: []
224 224 },
225 225 // 短信渠道
226 226 channelOptions: [],
... ... @@ -237,12 +237,8 @@ export default {
237 237 /** 查询列表 */
238 238 getList() {
239 239 this.loading = true;
240   - // 处理查询参数
241   - let params = {...this.queryParams};
242   - this.addBeginAndEndTime(params, this.dateRangeSendTime, 'sendTime');
243   - this.addBeginAndEndTime(params, this.dateRangeReceiveTime, 'receiveTime');
244 240 // 执行查询
245   - getSmsLogPage(params).then(response => {
  241 + getSmsLogPage(this.queryParams).then(response => {
246 242 this.list = response.data.list;
247 243 this.total = response.data.total;
248 244 this.loading = false;
... ... @@ -260,8 +256,6 @@ export default {
260 256 },
261 257 /** 重置按钮操作 */
262 258 resetQuery() {
263   - this.dateRangeSendTime = [];
264   - this.dateRangeReceiveTime = [];
265 259 this.resetForm("queryForm");
266 260 this.handleQuery();
267 261 },
... ... @@ -271,8 +265,6 @@ export default {
271 265 let params = {...this.queryParams};
272 266 params.pageNo = undefined;
273 267 params.pageSize = undefined;
274   - this.addBeginAndEndTime(params, this.dateRangeSendTime, 'sendTime');
275   - this.addBeginAndEndTime(params, this.dateRangeReceiveTime, 'receiveTime');
276 268 // 执行导出
277 269 this.$modal.confirm('是否确认导出所有短信日志数据项?').then(() => {
278 270 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/system/sms/smsTemplate.vue
  View file @26f684e
... ... @@ -28,9 +28,9 @@
28 28 :label="channel.signature + '【' + getDictDataLabel(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, channel.code) + '】'" />
29 29 </el-select>
30 30 </el-form-item>
31   - <el-form-item label="创建时间">
32   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
33   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  31 + <el-form-item label="创建时间" prop="createTime">
  32 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  33 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
34 34 </el-form-item>
35 35 <el-form-item>
36 36 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -183,7 +183,6 @@ export default {
183 183 title: "",
184 184 // 是否显示弹出层
185 185 open: false,
186   - dateRangeCreateTime: [],
187 186 // 查询参数
188 187 queryParams: {
189 188 pageNo: 1,
... ... @@ -194,6 +193,7 @@ export default {
194 193 content: null,
195 194 apiTemplateId: null,
196 195 channelId: null,
  196 + createTime: []
197 197 },
198 198 // 表单参数
199 199 form: {},
... ... @@ -232,11 +232,8 @@ export default {
232 232 /** 查询列表 */
233 233 getList() {
234 234 this.loading = true;
235   - // 处理查询参数
236   - let params = {...this.queryParams};
237   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
238 235 // 执行查询
239   - getSmsTemplatePage(params).then(response => {
  236 + getSmsTemplatePage(this.queryParams).then(response => {
240 237 this.list = response.data.list;
241 238 this.total = response.data.total;
242 239 this.loading = false;
... ... @@ -269,7 +266,6 @@ export default {
269 266 },
270 267 /** 重置按钮操作 */
271 268 resetQuery() {
272   - this.dateRangeCreateTime = [];
273 269 this.resetForm("queryForm");
274 270 this.handleQuery();
275 271 },
... ... @@ -328,7 +324,6 @@ export default {
328 324 let params = {...this.queryParams};
329 325 params.pageNo = undefined;
330 326 params.pageSize = undefined;
331   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
332 327 // 执行导出
333 328 this.$modal.confirm('是否确认导出所有短信模板数据项?', "警告").then(() => {
334 329 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/system/tenant/index.vue
  View file @26f684e
... ... @@ -18,6 +18,10 @@
18 18 :key="dict.value" :label="dict.label" :value="dict.value"/>
19 19 </el-select>
20 20 </el-form-item>
  21 + <el-form-item label="创建时间" prop="createTime">
  22 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  23 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
  24 + </el-form-item>
21 25 <el-form-item>
22 26 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
23 27 <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
... ... @@ -158,7 +162,6 @@ export default {
158 162 title: "",
159 163 // 是否显示弹出层
160 164 open: false,
161   - dateRangeCreateTime: [],
162 165 // 查询参数
163 166 queryParams: {
164 167 pageNo: 1,
... ... @@ -167,6 +170,7 @@ export default {
167 170 contactName: null,
168 171 contactMobile: null,
169 172 status: undefined,
  173 + createTime: []
170 174 },
171 175 // 表单参数
172 176 form: {},
... ... @@ -195,11 +199,8 @@ export default {
195 199 /** 查询列表 */
196 200 getList() {
197 201 this.loading = true;
198   - // 处理查询参数
199   - let params = {...this.queryParams};
200   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
201 202 // 执行查询
202   - getTenantPage(params).then(response => {
  203 + getTenantPage(this.queryParams).then(response => {
203 204 this.list = response.data.list;
204 205 this.total = response.data.total;
205 206 this.loading = false;
... ... @@ -232,7 +233,6 @@ export default {
232 233 },
233 234 /** 重置按钮操作 */
234 235 resetQuery() {
235   - this.dateRangeCreateTime = [];
236 236 this.resetForm("queryForm");
237 237 this.handleQuery();
238 238 },
... ... @@ -291,7 +291,6 @@ export default {
291 291 let params = {...this.queryParams};
292 292 params.pageNo = undefined;
293 293 params.pageSize = undefined;
294   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
295 294 // 执行导出
296 295 this.$modal.confirm('是否确认导出所有租户数据项?').then(() => {
297 296 this.exportLoading = true;
... ...
yudao-ui-admin/src/views/system/tenantPackage/index.vue
  View file @26f684e
... ... @@ -12,9 +12,9 @@
12 12 :key="dict.value" :label="dict.label" :value="dict.value"/>
13 13 </el-select>
14 14 </el-form-item>
15   - <el-form-item label="创建时间">
16   - <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
17   - type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
  15 + <el-form-item label="创建时间" prop="createTime">
  16 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  17 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
18 18 </el-form-item>
19 19 <el-form-item>
20 20 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -114,7 +114,6 @@ export default {
114 114 title: "",
115 115 // 是否显示弹出层
116 116 open: false,
117   - dateRangeCreateTime: [],
118 117 // 查询参数
119 118 queryParams: {
120 119 pageNo: 1,
... ... @@ -122,6 +121,7 @@ export default {
122 121 name: null,
123 122 status: null,
124 123 remark: null,
  124 + createTime: []
125 125 },
126 126 // 表单参数
127 127 form: {},
... ... @@ -149,11 +149,8 @@ export default {
149 149 /** 查询列表 */
150 150 getList() {
151 151 this.loading = true;
152   - // 处理查询参数
153   - let params = {...this.queryParams};
154   - this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
155 152 // 执行查询
156   - getTenantPackagePage(params).then(response => {
  153 + getTenantPackagePage(this.queryParams).then(response => {
157 154 this.list = response.data.list;
158 155 this.total = response.data.total;
159 156 this.loading = false;
... ... @@ -190,7 +187,6 @@ export default {
190 187 },
191 188 /** 重置按钮操作 */
192 189 resetQuery() {
193   - this.dateRangeCreateTime = [];
194 190 // 表单重置
195 191 this.resetForm("queryForm");
196 192 this.handleQuery();
... ...
yudao-ui-admin/src/views/system/user/index.vue
  View file @26f684e
... ... @@ -31,9 +31,9 @@
31 31 <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
32 32 </el-select>
33 33 </el-form-item>
34   - <el-form-item label="创建时间">
35   - <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
36   - range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
  34 + <el-form-item label="创建时间" prop="createTime">
  35 + <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
  36 + range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
37 37 </el-form-item>
38 38 <el-form-item>
39 39 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
... ... @@ -237,7 +237,6 @@ import {
237 237 resetUserPwd,
238 238 updateUser
239 239 } from "@/api/system/user";
240   -import {getAccessToken} from "@/utils/auth";
241 240 import Treeselect from "@riophae/vue-treeselect";
242 241 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
243 242  
... ... @@ -275,8 +274,6 @@ export default {
275 274 deptName: undefined,
276 275 // 默认密码
277 276 initPassword: undefined,
278   - // 日期范围
279   - dateRange: [],
280 277 // 状态数据字典
281 278 statusOptions: [],
282 279 // 性别状态字典
... ... @@ -313,7 +310,8 @@ export default {
313 310 username: undefined,
314 311 mobile: undefined,
315 312 status: undefined,
316   - deptId: undefined
  313 + deptId: undefined,
  314 + createTime: []
317 315 },
318 316 // 列信息
319 317 columns: [
... ... @@ -345,7 +343,7 @@ export default {
345 343 ],
346 344 mobile: [
347 345 {
348   - pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
  346 + pattern: /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/,
349 347 message: "请输入正确的手机号码",
350 348 trigger: "blur"
351 349 }
... ... @@ -397,10 +395,7 @@ export default {
397 395 /** 查询用户列表 */
398 396 getList() {
399 397 this.loading = true;
400   - listUser(this.addDateRange(this.queryParams, [
401   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
402   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
403   - ])).then(response => {
  398 + listUser(this.queryParams).then(response => {
404 399 this.userList = response.data.list;
405 400 this.total = response.data.total;
406 401 this.loading = false;
... ... @@ -477,7 +472,6 @@ export default {
477 472 },
478 473 /** 重置按钮操作 */
479 474 resetQuery() {
480   - this.dateRange = [];
481 475 this.resetForm("queryForm");
482 476 this.handleQuery();
483 477 },
... ... @@ -581,13 +575,13 @@ export default {
581 575 },
582 576 /** 导出按钮操作 */
583 577 handleExport() {
584   - const queryParams = this.addDateRange(this.queryParams, [
585   - this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
586   - this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
587   - ]);
588 578 this.$modal.confirm('是否确认导出所有用户数据项?').then(() => {
  579 + // 处理查询参数
  580 + let params = {...this.queryParams};
  581 + params.pageNo = undefined;
  582 + params.pageSize = undefined;
589 583 this.exportLoading = true;
590   - return exportUser(queryParams);
  584 + return exportUser(params);
591 585 }).then(response => {
592 586 this.$download.excel(response, '用户数据.xls');
593 587 this.exportLoading = false;
... ...