diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index a8c51a7..0fc68be 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -5,7 +5,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; /** * Entity基类 @@ -36,14 +35,6 @@ public class BaseEntity implements Serializable /** 备注 */ private String remark; - /** 开始时间 */ - @JsonIgnore - private String beginTime; - - /** 结束时间 */ - @JsonIgnore - private String endTime; - /** 请求参数 */ private Map params; @@ -107,26 +98,6 @@ public class BaseEntity implements Serializable this.remark = remark; } - public String getBeginTime() - { - return beginTime; - } - - public void setBeginTime(String beginTime) - { - this.beginTime = beginTime; - } - - public String getEndTime() - { - return endTime; - } - - public void setEndTime(String endTime) - { - this.endTime = endTime; - } - public Map getParams() { if (params == null) diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml index 75c8cae..83ba469 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -64,11 +64,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND lower(table_comment) like lower(concat('%', #{tableComment}, '%')) - - AND date_format(create_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d') + + AND date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - - AND date_format(create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + + AND date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') @@ -84,11 +84,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND lower(table_comment) like lower(concat('%', #{tableComment}, '%')) - - AND date_format(create_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d') + + AND date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - - AND date_format(create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + + AND date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml index 7601e63..588d177 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -35,11 +35,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND invoke_target like concat('%', #{invokeTarget}, '%') - - and date_format(create_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d') + + and date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - - and date_format(create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + + and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml index 9c35661..b1570e2 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -50,11 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND config_key like concat('%', #{configKey}, '%') - - and date_format(create_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d') + + and date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - - and date_format(create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + + and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index a3d6ec5..2b44b2e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -32,11 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND dict_type like concat('%', #{dictType}, '%') - - and date_format(create_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d') + + and date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - - and date_format(create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + + and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 6f0a241..26d51fa 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -33,11 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND user_name like concat('%', #{userName}, '%') - - and date_format(login_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d') + + and date_format(login_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - - and date_format(login_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + + and date_format(login_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') order by info_id desc diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index e70b7bf..2359a49 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -54,11 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND oper_name like concat('%', #{operName}, '%') - - and date_format(oper_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d') + + and date_format(oper_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - - and date_format(oper_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + + and date_format(oper_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') order by oper_id desc diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 818941f..0a8bc70 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -42,11 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND r.role_key like concat('%', #{roleKey}, '%') - - and date_format(r.create_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d') + + and date_format(r.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - - and date_format(r.create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + + and date_format(r.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') ${params.dataScope} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 3683eb7..a253d8d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -68,11 +68,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.phonenumber like concat('%', #{phonenumber}, '%') - - AND date_format(u.create_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d') + + AND date_format(u.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - - AND date_format(u.create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + + AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) )) diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js index 04ee5b4..15f7fcf 100644 --- a/ruoyi-ui/src/utils/request.js +++ b/ruoyi-ui/src/utils/request.js @@ -19,6 +19,28 @@ service.interceptors.request.use(config => { if (getToken() && !isToken) { config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 } + // get请求映射params参数 + if (config.method === 'get' && config.params) { + let url = config.url + '?'; + for (const propName of Object.keys(config.params)) { + const value = config.params[propName]; + var part = encodeURIComponent(propName) + "="; + if (typeof(value) !== "undefined") { + if (typeof value === 'object') { + for (const key of Object.keys(value)) { + let params = propName + '[' + key + ']'; + var subPart = encodeURIComponent(params) + "="; + url += subPart + encodeURIComponent(value[key]) + "&"; + } + } else { + url += part + encodeURIComponent(value) + "&"; + } + } + } + url = url.slice(0, -1); + config.params = {}; + config.url = url; + } return config }, error => { console.log(error) diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js index 994c0cc..0cecbc0 100644 --- a/ruoyi-ui/src/utils/ruoyi.js +++ b/ruoyi-ui/src/utils/ruoyi.js @@ -54,13 +54,17 @@ export function resetForm(refName) { } // 添加日期范围 -export function addDateRange(params, dateRange) { +export function addDateRange(params, dateRange, propName) { var search = params; - search.beginTime = ""; - search.endTime = ""; + search.params = {}; if (null != dateRange && '' != dateRange) { - search.beginTime = dateRange[0]; - search.endTime = dateRange[1]; + if (typeof(propName) === "undefined") { + search.params["beginTime"] = dateRange[0]; + search.params["endTime"] = dateRange[1]; + } else { + search.params[propName + "BeginTime"] = dateRange[0]; + search.params[propName + "EndTime"] = dateRange[1]; + } } return search; }