Commit 509f1701 by RuoYi

时间查询&排序支持一波

parent 45d1a161
...@@ -146,9 +146,9 @@ create table sys_menu ( ...@@ -146,9 +146,9 @@ create table sys_menu (
-- 初始化-菜单信息表数据 -- 初始化-菜单信息表数据
-- ---------------------------- -- ----------------------------
-- 一级菜单 -- 一级菜单
insert into sys_menu values('1', '系统管理', '0', '1', '#', 'M', '0', '', 'fa fa-gear', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统管理目录'); insert into sys_menu values('1', '系统管理', '0', '1', '#', 'M', '0', '#', 'fa fa-gear', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统管理目录');
insert into sys_menu values('2', '系统监控', '0', '2', '#', 'M', '0', '', 'fa fa-video-camera', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统监控目录'); insert into sys_menu values('2', '系统监控', '0', '2', '#', 'M', '0', '#', 'fa fa-video-camera', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统监控目录');
insert into sys_menu values('3', '系统工具', '0', '3', '#', 'M', '0', '', 'fa fa-bars', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统工具目录'); insert into sys_menu values('3', '系统工具', '0', '3', '#', 'M', '0', '#', 'fa fa-bars', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统工具目录');
-- 二级菜单 -- 二级菜单
insert into sys_menu values('100', '用户管理', '1', '1', '/system/user', 'C', '0', 'system:user:view', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '用户管理菜单'); insert into sys_menu values('100', '用户管理', '1', '1', '/system/user', 'C', '0', 'system:user:view', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '用户管理菜单');
insert into sys_menu values('101', '角色管理', '1', '2', '/system/role', 'C', '0', 'system:role:view', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '角色管理菜单'); insert into sys_menu values('101', '角色管理', '1', '2', '/system/role', 'C', '0', 'system:role:view', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '角色管理菜单');
...@@ -538,7 +538,7 @@ create table sys_job ( ...@@ -538,7 +538,7 @@ create table sys_job (
job_name varchar(64) default '' comment '任务名称', job_name varchar(64) default '' comment '任务名称',
job_group varchar(64) default '' comment '任务组名', job_group varchar(64) default '' comment '任务组名',
method_name varchar(500) default '' comment '任务方法', method_name varchar(500) default '' comment '任务方法',
params varchar(200) default '' comment '方法参数', method_params varchar(200) default '' comment '方法参数',
cron_expression varchar(255) default '' comment 'cron执行表达式', cron_expression varchar(255) default '' comment 'cron执行表达式',
status char(1) default '0' comment '状态(0正常 1暂停)', status char(1) default '0' comment '状态(0正常 1暂停)',
create_by varchar(64) default '' comment '创建者', create_by varchar(64) default '' comment '创建者',
...@@ -562,7 +562,7 @@ create table sys_job_log ( ...@@ -562,7 +562,7 @@ create table sys_job_log (
job_name varchar(64) not null comment '任务名称', job_name varchar(64) not null comment '任务名称',
job_group varchar(64) not null comment '任务组名', job_group varchar(64) not null comment '任务组名',
method_name varchar(500) comment '任务方法', method_name varchar(500) comment '任务方法',
params varchar(200) default '' comment '方法参数', method_params varchar(200) default '' comment '方法参数',
job_message varchar(500) comment '日志信息', job_message varchar(500) comment '日志信息',
status char(1) default '0' comment '执行状态(0正常 1失败)', status char(1) default '0' comment '执行状态(0正常 1失败)',
exception_info text comment '异常信息', exception_info text comment '异常信息',
......
...@@ -99,7 +99,7 @@ public class LogAspect ...@@ -99,7 +99,7 @@ public class LogAspect
{ {
operLog.setOperName(currentUser.getLoginName()); operLog.setOperName(currentUser.getLoginName());
if (StringUtils.isNotNull(currentUser.getDept()) if (StringUtils.isNotNull(currentUser.getDept())
&& StringUtils.isEmpty(currentUser.getDept().getDeptName())) && StringUtils.isNotEmpty(currentUser.getDept().getDeptName()))
{ {
operLog.setDeptName(currentUser.getDept().getDeptName()); operLog.setDeptName(currentUser.getDept().getDeptName());
} }
......
...@@ -3,8 +3,7 @@ package com.ruoyi.framework.web.domain; ...@@ -3,8 +3,7 @@ package com.ruoyi.framework.web.domain;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.utils.DateUtils;
/** /**
* Entity基类 * Entity基类
...@@ -22,19 +21,21 @@ public class BaseEntity implements Serializable ...@@ -22,19 +21,21 @@ public class BaseEntity implements Serializable
private String createBy; private String createBy;
/** 创建时间 */ /** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime; private Date createTime;
/** 更新者 */ /** 更新者 */
private String updateBy; private String updateBy;
/** 更新时间 */ /** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime; private Date updateTime;
/** 备注 */ /** 备注 */
private String remark; private String remark;
/** 请求参数 */ /** 请求参数 */
private Map<String, Object> reqParams; private Map<String, Object> params;
public String getSearchValue() public String getSearchValue()
{ {
...@@ -61,16 +62,6 @@ public class BaseEntity implements Serializable ...@@ -61,16 +62,6 @@ public class BaseEntity implements Serializable
return createTime; return createTime;
} }
public String getCreateTimeStr()
{
return createTime != null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, createTime) : "";
}
public String getCreateDateTimeStr()
{
return createTime != null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, createTime) : "";
}
public void setCreateTime(Date createTime) public void setCreateTime(Date createTime)
{ {
this.createTime = createTime; this.createTime = createTime;
...@@ -91,16 +82,6 @@ public class BaseEntity implements Serializable ...@@ -91,16 +82,6 @@ public class BaseEntity implements Serializable
return updateTime; return updateTime;
} }
public String getUpdateTimeStr()
{
return updateTime != null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, updateTime) : "";
}
public String getUpdateDateTimeStr()
{
return updateTime != null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, updateTime) : "";
}
public void setUpdateTime(Date updateTime) public void setUpdateTime(Date updateTime)
{ {
this.updateTime = updateTime; this.updateTime = updateTime;
...@@ -116,14 +97,14 @@ public class BaseEntity implements Serializable ...@@ -116,14 +97,14 @@ public class BaseEntity implements Serializable
this.remark = remark; this.remark = remark;
} }
public Map<String, Object> getReqParams() public Map<String, Object> getParams()
{ {
return reqParams; return params;
} }
public void setReqParams(Map<String, Object> reqParams) public void setParams(Map<String, Object> params)
{ {
this.reqParams = reqParams; this.params = params;
} }
} }
...@@ -32,7 +32,7 @@ public class Job extends BaseEntity implements Serializable ...@@ -32,7 +32,7 @@ public class Job extends BaseEntity implements Serializable
/** 方法参数 */ /** 方法参数 */
@Excel(name = "方法参数") @Excel(name = "方法参数")
private String params; private String methodParams;
/** cron执行表达式 */ /** cron执行表达式 */
@Excel(name = "执行表达式 ") @Excel(name = "执行表达式 ")
...@@ -82,14 +82,14 @@ public class Job extends BaseEntity implements Serializable ...@@ -82,14 +82,14 @@ public class Job extends BaseEntity implements Serializable
this.methodName = methodName; this.methodName = methodName;
} }
public String getParams() public String getMethodParams()
{ {
return params; return methodParams;
} }
public void setParams(String params) public void setMethodParams(String methodParams)
{ {
this.params = params; this.methodParams = methodParams;
} }
public String getCronExpression() public String getCronExpression()
...@@ -116,7 +116,7 @@ public class Job extends BaseEntity implements Serializable ...@@ -116,7 +116,7 @@ public class Job extends BaseEntity implements Serializable
public String toString() public String toString()
{ {
return "Job [jobId=" + jobId + ", jobName=" + jobName + ", jobGroup=" + jobGroup + ", methodName=" + methodName return "Job [jobId=" + jobId + ", jobName=" + jobName + ", jobGroup=" + jobGroup + ", methodName=" + methodName
+ ", params=" + params + ", cronExpression=" + cronExpression + ", status=" + status + "]"; + ", methodParams=" + methodParams + ", cronExpression=" + cronExpression + ", status=" + status + "]";
} }
} }
...@@ -30,7 +30,7 @@ public class JobLog extends BaseEntity ...@@ -30,7 +30,7 @@ public class JobLog extends BaseEntity
/** 方法参数 */ /** 方法参数 */
@Excel(name = "方法参数") @Excel(name = "方法参数")
private String params; private String methodParams;
/** 日志信息 */ /** 日志信息 */
@Excel(name = "日志信息") @Excel(name = "日志信息")
...@@ -84,14 +84,14 @@ public class JobLog extends BaseEntity ...@@ -84,14 +84,14 @@ public class JobLog extends BaseEntity
this.methodName = methodName; this.methodName = methodName;
} }
public String getParams() public String getMethodParams()
{ {
return params; return methodParams;
} }
public void setParams(String params) public void setMethodParams(String methodParams)
{ {
this.params = params; this.methodParams = methodParams;
} }
public String getJobMessage() public String getJobMessage()
...@@ -128,7 +128,7 @@ public class JobLog extends BaseEntity ...@@ -128,7 +128,7 @@ public class JobLog extends BaseEntity
public String toString() public String toString()
{ {
return "JobLog [jobLogId=" + jobLogId + ", jobName=" + jobName + ", jobGroup=" + jobGroup + ", methodName=" return "JobLog [jobLogId=" + jobLogId + ", jobName=" + jobName + ", jobGroup=" + jobGroup + ", methodName="
+ methodName + ", params=" + params + ", jobMessage=" + jobMessage + ", status=" + status + methodName + ", methodParams=" + methodParams + ", jobMessage=" + jobMessage + ", status=" + status
+ ", exceptionInfo=" + exceptionInfo + "]"; + ", exceptionInfo=" + exceptionInfo + "]";
} }
......
...@@ -41,7 +41,7 @@ public class ScheduleJob extends QuartzJobBean ...@@ -41,7 +41,7 @@ public class ScheduleJob extends QuartzJobBean
jobLog.setJobName(job.getJobName()); jobLog.setJobName(job.getJobName());
jobLog.setJobGroup(job.getJobGroup()); jobLog.setJobGroup(job.getJobGroup());
jobLog.setMethodName(job.getMethodName()); jobLog.setMethodName(job.getMethodName());
jobLog.setParams(job.getParams()); jobLog.setMethodParams(job.getMethodParams());
jobLog.setCreateTime(new Date()); jobLog.setCreateTime(new Date());
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
...@@ -50,7 +50,7 @@ public class ScheduleJob extends QuartzJobBean ...@@ -50,7 +50,7 @@ public class ScheduleJob extends QuartzJobBean
{ {
// 执行任务 // 执行任务
log.info("任务开始执行 - 名称:{} 方法:{}", job.getJobName(), job.getMethodName()); log.info("任务开始执行 - 名称:{} 方法:{}", job.getJobName(), job.getMethodName());
ScheduleRunnable task = new ScheduleRunnable(job.getJobName(), job.getMethodName(), job.getParams()); ScheduleRunnable task = new ScheduleRunnable(job.getJobName(), job.getMethodName(), job.getMethodParams());
Future<?> future = service.submit(task); Future<?> future = service.submit(task);
future.get(); future.get();
long times = System.currentTimeMillis() - startTime; long times = System.currentTimeMillis() - startTime;
......
...@@ -9,15 +9,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -9,15 +9,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="jobName" column="job_name" /> <result property="jobName" column="job_name" />
<result property="jobGroup" column="job_group" /> <result property="jobGroup" column="job_group" />
<result property="methodName" column="method_name" /> <result property="methodName" column="method_name" />
<result property="params" column="params" /> <result property="methodParams" column="method_params" />
<result property="jobMessage" column="job_message" /> <result property="jobMessage" column="job_message" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="exceptionInfo" column="exception_info" /> <result property="exceptionInfo" column="exception_info" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
</resultMap> </resultMap>
<sql id="selectJobLogVo"> <sql id="selectJobLogVo">
select job_log_id, job_name, job_group, method_name, params, job_message, status, exception_info, create_time from sys_job_log select job_log_id, job_name, job_group, method_name, method_params, job_message, status, exception_info, create_time from sys_job_log
</sql> </sql>
<select id="selectJobLogList" parameterType="JobLog" resultMap="JobLogResult"> <select id="selectJobLogList" parameterType="JobLog" resultMap="JobLogResult">
...@@ -32,11 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -32,11 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="methodName != null and methodName != ''"> <if test="methodName != null and methodName != ''">
AND method_name like concat('%', #{methodName}, '%') AND method_name like concat('%', #{methodName}, '%')
</if> </if>
<if test="reqParams != null and reqParams.beginTime != ''"><!-- 开始时间检索 --> <if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{reqParams.beginTime},'%y%m%d') and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if> </if>
<if test="reqParams != null and reqParams.endTime != ''"><!-- 结束时间检索 --> <if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{reqParams.endTime},'%y%m%d') and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if> </if>
</where> </where>
</select> </select>
...@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jobName != null and jobName != ''">job_name,</if> <if test="jobName != null and jobName != ''">job_name,</if>
<if test="jobGroup != null and jobGroup != ''">job_group,</if> <if test="jobGroup != null and jobGroup != ''">job_group,</if>
<if test="methodName != null and methodName != ''">method_name,</if> <if test="methodName != null and methodName != ''">method_name,</if>
<if test="params != null and params != ''">params,</if> <if test="methodParams != null and methodParams != ''">method_params,</if>
<if test="jobMessage != null and jobMessage != ''">job_message,</if> <if test="jobMessage != null and jobMessage != ''">job_message,</if>
<if test="status != null and status != ''">status,</if> <if test="status != null and status != ''">status,</if>
<if test="exceptionInfo != null and exceptionInfo != ''">exception_info,</if> <if test="exceptionInfo != null and exceptionInfo != ''">exception_info,</if>
...@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jobName != null and jobName != ''">#{jobName},</if> <if test="jobName != null and jobName != ''">#{jobName},</if>
<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if> <if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
<if test="methodName != null and methodName != ''">#{methodName},</if> <if test="methodName != null and methodName != ''">#{methodName},</if>
<if test="params != null and params != ''">#{params},</if> <if test="methodParams != null and methodParams != ''">#{methodParams},</if>
<if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if> <if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
<if test="status != null and status != ''">#{status},</if> <if test="status != null and status != ''">#{status},</if>
<if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if> <if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
......
...@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="jobName" column="job_name" /> <result property="jobName" column="job_name" />
<result property="jobGroup" column="job_group" /> <result property="jobGroup" column="job_group" />
<result property="methodName" column="method_name" /> <result property="methodName" column="method_name" />
<result property="params" column="params" /> <result property="methodParams" column="method_params" />
<result property="cronExpression" column="cron_expression" /> <result property="cronExpression" column="cron_expression" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
...@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectJobVo"> <sql id="selectJobVo">
select job_id, job_name, job_group, method_name, params, cron_expression, status, create_by, create_time, remark from sys_job select job_id, job_name, job_group, method_name, method_params, cron_expression, status, create_by, create_time, remark from sys_job
</sql> </sql>
<select id="selectJobList" parameterType="Job" resultMap="JobResult"> <select id="selectJobList" parameterType="Job" resultMap="JobResult">
...@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jobName != null and jobName != ''">job_name = #{jobName},</if> <if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
<if test="jobGroup != null and jobGroup != ''">job_group = #{jobGroup},</if> <if test="jobGroup != null and jobGroup != ''">job_group = #{jobGroup},</if>
<if test="methodName != null and methodName != ''">method_name = #{methodName},</if> <if test="methodName != null and methodName != ''">method_name = #{methodName},</if>
<if test="params != null and params != ''">params = #{params},</if> <if test="methodParams != null and methodParams != ''">method_params = #{methodParams},</if>
<if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if> <if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if>
<if test="status !=null">status = #{status},</if> <if test="status !=null">status = #{status},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if> <if test="remark != null and remark != ''">remark = #{remark},</if>
...@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jobName != null and jobName != ''">job_name,</if> <if test="jobName != null and jobName != ''">job_name,</if>
<if test="jobGroup != null and jobGroup != ''">job_group,</if> <if test="jobGroup != null and jobGroup != ''">job_group,</if>
<if test="methodName != null and methodName != ''">method_name,</if> <if test="methodName != null and methodName != ''">method_name,</if>
<if test="params != null and params != ''">params,</if> <if test="methodParams != null and methodParams != ''">method_params,</if>
<if test="cronExpression != null and cronExpression != ''">cron_expression,</if> <if test="cronExpression != null and cronExpression != ''">cron_expression,</if>
<if test="status != null and status != ''">status,</if> <if test="status != null and status != ''">status,</if>
<if test="remark != null and remark != ''">remark,</if> <if test="remark != null and remark != ''">remark,</if>
...@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jobName != null and jobName != ''">#{jobName},</if> <if test="jobName != null and jobName != ''">#{jobName},</if>
<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if> <if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
<if test="methodName != null and methodName != ''">#{methodName},</if> <if test="methodName != null and methodName != ''">#{methodName},</if>
<if test="params != null and params != ''">#{params},</if> <if test="methodParams != null and methodParams != ''">#{method_params},</if>
<if test="cronExpression != null and cronExpression != ''">#{cronExpression},</if> <if test="cronExpression != null and cronExpression != ''">#{cronExpression},</if>
<if test="status != null and status != ''">#{status},</if> <if test="status != null and status != ''">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if> <if test="remark != null and remark != ''">#{remark},</if>
......
...@@ -33,11 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -33,11 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="loginName != null and loginName != ''"> <if test="loginName != null and loginName != ''">
AND login_name like concat('%', #{loginName}, '%') AND login_name like concat('%', #{loginName}, '%')
</if> </if>
<if test="reqParams != null and reqParams.beginTime != ''"><!-- 开始时间检索 --> <if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(login_time,'%y%m%d') &gt;= date_format(#{reqParams.beginTime},'%y%m%d') and date_format(login_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if> </if>
<if test="reqParams != null and reqParams.endTime != ''"><!-- 结束时间检索 --> <if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(login_time,'%y%m%d') &lt;= date_format(#{reqParams.endTime},'%y%m%d') and date_format(login_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if> </if>
</where> </where>
</select> </select>
......
...@@ -38,11 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -38,11 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="operName != null and operName != ''"> <if test="operName != null and operName != ''">
AND oper_name like concat('%', #{operName}, '%') AND oper_name like concat('%', #{operName}, '%')
</if> </if>
<if test="reqParams != null and reqParams.beginTime != ''"><!-- 开始时间检索 --> <if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(oper_time,'%y%m%d') &gt;= date_format(#{reqParams.beginTime},'%y%m%d') and date_format(oper_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if> </if>
<if test="reqParams != null and reqParams.endTime != ''"><!-- 结束时间检索 --> <if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(oper_time,'%y%m%d') &lt;= date_format(#{reqParams.endTime},'%y%m%d') and date_format(oper_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if> </if>
</where> </where>
</select> </select>
......
...@@ -42,6 +42,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -42,6 +42,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="configKey != null and configKey != ''"> <if test="configKey != null and configKey != ''">
AND config_key like concat('%', #{configKey}, '%') AND config_key like concat('%', #{configKey}, '%')
</if> </if>
<if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where> </where>
</select> </select>
......
...@@ -31,6 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -31,6 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dictType != null and dictType != ''"> <if test="dictType != null and dictType != ''">
AND dict_type like concat('%', #{dictType}, '%') AND dict_type like concat('%', #{dictType}, '%')
</if> </if>
<if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where> </where>
</select> </select>
......
...@@ -33,6 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -33,6 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="roleKey != null and roleKey != ''"> <if test="roleKey != null and roleKey != ''">
AND role_key like concat('%', #{roleKey}, '%') AND role_key like concat('%', #{roleKey}, '%')
</if> </if>
<if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where> </where>
</select> </select>
......
...@@ -56,6 +56,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -56,6 +56,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="phonenumber != null and phonenumber != ''"> <if test="phonenumber != null and phonenumber != ''">
AND u.phonenumber like concat('%', #{phonenumber}, '%') AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if> </if>
<if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
<if test="deptId != null and parentId != null and parentId != 0"> <if test="deptId != null and parentId != null and parentId != 0">
AND u.dept_id IN (SELECT t.dept_id FROM sys_dept t WHERE t.dept_id = #{deptId} OR t.parent_id = #{deptId}) AND u.dept_id IN (SELECT t.dept_id FROM sys_dept t WHERE t.dept_id = #{deptId} OR t.parent_id = #{deptId})
</if> </if>
......
...@@ -30,6 +30,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -30,6 +30,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="tableComment != null and tableComment != ''"> <if test="tableComment != null and tableComment != ''">
AND table_comment like concat('%', #{tableComment}, '%') AND table_comment like concat('%', #{tableComment}, '%')
</if> </if>
<if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</select> </select>
<select id="selectTableByName" parameterType="String" resultMap="TableInfoResult"> <select id="selectTableByName" parameterType="String" resultMap="TableInfoResult">
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Author: Ruoyi * Author: Ruoyi
*/ */
/** 用户管理 样式布局 */ /** 用户管理 样式布局 */
.box { .box {
position: relative; position: relative;
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
margin: 5px 0 5px -25px margin: 5px 0 5px -25px
} }
/** select2 样式修改 */ /** select2 样式修改 */
.select2-container--default .select2-selection--multiple .select2-selection__choice { .select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: #1AB394; background-color: #1AB394;
border-color: #1AB394; border-color: #1AB394;
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
padding-right: 10px padding-right: 10px
} }
/** 表单验证 样式布局 */ /** 表单验证 样式布局 */
label.error { label.error {
position: absolute; position: absolute;
right: 18px; right: 18px;
...@@ -136,7 +136,7 @@ label.error { ...@@ -136,7 +136,7 @@ label.error {
padding-left: 25px padding-left: 25px
} }
/** 遮罩层 */ /** 遮罩层 */
.loaderbox { .loaderbox {
display: inline-block; display: inline-block;
min-width: 125px; min-width: 125px;
...@@ -200,7 +200,7 @@ label.error { ...@@ -200,7 +200,7 @@ label.error {
} }
} }
/** 表单查询条件 */ /** 表单查询条件 */
label{ label{
font-weight: normal; font-weight: normal;
...@@ -306,7 +306,7 @@ label{ ...@@ -306,7 +306,7 @@ label{
cursor: pointer; cursor: pointer;
} }
/** 表格查询数据 */ /** 表格查询数据 */
.table-striped{ .table-striped{
min-height:75%; min-height:75%;
} }
......
...@@ -18,6 +18,13 @@ $(function(){ ...@@ -18,6 +18,13 @@ $(function(){
radioClass: "iradio_square-green", radioClass: "iradio_square-green",
}) })
} }
if ($(".time").length > 0) {
layui.use('laydate', function() {
var laydate = layui.laydate;
laydate.render({ elem: '#startTime', theme: 'molv' });
laydate.render({ elem: '#endTime', theme: 'molv' });
});
}
}); });
/** 创建选项卡 */ /** 创建选项卡 */
......
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
}); });
return checkeds; return checkeds;
}, },
// 获取选中复选框项 // 获取选中下拉框项
selectSelects: function(name) { selectSelects: function(name) {
var selects = ""; var selects = "";
$('#' + name + ' option:selected').each(function (i) { $('#' + name + ' option:selected').each(function (i) {
......
...@@ -77,18 +77,20 @@ ...@@ -77,18 +77,20 @@
}, },
{ {
field: 'jobName', field: 'jobName',
title: '任务名称' title: '任务名称',
sortable: true
}, },
{ {
field: 'jobGroup', field: 'jobGroup',
title: '任务组名' title: '任务组名',
sortable: true
}, },
{ {
field: 'methodName', field: 'methodName',
title: '方法名称' title: '方法名称'
}, },
{ {
field: 'params', field: 'methodParams',
title: '方法参数' title: '方法参数'
}, },
{ {
...@@ -108,8 +110,9 @@ ...@@ -108,8 +110,9 @@
} }
}, },
{ {
field: 'createDateTimeStr', field: 'createTime',
title: '创建时间' title: '创建时间',
sortable: true
}, },
{ {
title: '操作', title: '操作',
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
</li> </li>
<li class="time"> <li class="time">
<label>执行时间: </label> <label>执行时间: </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="reqParams[beginTime]"/> <input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span> <span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="reqParams[endTime]"/> <input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
...@@ -73,18 +73,20 @@ ...@@ -73,18 +73,20 @@
}, },
{ {
field: 'jobName', field: 'jobName',
title: '任务名称' title: '任务名称',
sortable: true
}, },
{ {
field: 'jobGroup', field: 'jobGroup',
title: '任务组名' title: '任务组名',
sortable: true
}, },
{ {
field: 'methodName', field: 'methodName',
title: '方法名称' title: '方法名称'
}, },
{ {
field: 'params', field: 'methodParams',
title: '方法参数' title: '方法参数'
}, },
{ {
...@@ -104,8 +106,9 @@ ...@@ -104,8 +106,9 @@
} }
}, },
{ {
field: 'createDateTimeStr', field: 'createTime',
title: '创建时间' title: '创建时间',
sortable: true
}, },
{ {
title: '操作', title: '操作',
...@@ -119,12 +122,6 @@ ...@@ -119,12 +122,6 @@
}; };
$.table.init(options); $.table.init(options);
}); });
layui.use('laydate', function() {
var laydate = layui.laydate;
laydate.render({ elem: '#startTime', theme: 'molv' });
laydate.render({ elem: '#endTime', theme: 'molv' });
});
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
</li> </li>
<li class="time"> <li class="time">
<label>登录时间: </label> <label>登录时间: </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="reqParams[beginTime]"/> <input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span> <span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="reqParams[endTime]"/> <input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
...@@ -72,7 +72,8 @@ ...@@ -72,7 +72,8 @@
}, },
{ {
field: 'loginName', field: 'loginName',
title: '登录名称' title: '登录名称',
sortable: true
}, },
{ {
field: 'ipaddr', field: 'ipaddr',
...@@ -108,17 +109,12 @@ ...@@ -108,17 +109,12 @@
}, },
{ {
field: 'loginTime', field: 'loginTime',
title: '登录时间' title: '登录时间',
sortable: true
}] }]
}; };
$.table.init(options); $.table.init(options);
}); });
layui.use('laydate', function() {
var laydate = layui.laydate;
laydate.render({ elem: '#startTime', theme: 'molv' });
laydate.render({ elem: '#endTime', theme: 'molv' });
});
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -57,7 +57,8 @@ ...@@ -57,7 +57,8 @@
}, },
{ {
field: 'loginName', field: 'loginName',
title: '登录名称' title: '登录名称',
sortable: true
}, },
{ {
field: 'deptName', field: 'deptName',
...@@ -93,11 +94,13 @@ ...@@ -93,11 +94,13 @@
}, },
{ {
field: 'startTimestamp', field: 'startTimestamp',
title: '登录时间' title: '登录时间',
sortable: true
}, },
{ {
field: 'lastAccessTime', field: 'lastAccessTime',
title: '最后访问时间' title: '最后访问时间',
sortable: true
}, },
{ {
title: '操作', title: '操作',
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
</li> </li>
<li class="time"> <li class="time">
<label>操作时间: </label> <label>操作时间: </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="reqParams[beginTime]"/> <input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span> <span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="reqParams[endTime]"/> <input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
...@@ -105,7 +105,8 @@ ...@@ -105,7 +105,8 @@
}, },
{ {
field: 'operName', field: 'operName',
title: '操作人员' title: '操作人员',
sortable: true
}, },
{ {
field: 'deptName', field: 'deptName',
...@@ -133,7 +134,8 @@ ...@@ -133,7 +134,8 @@
}, },
{ {
field: 'operTime', field: 'operTime',
title: '操作时间' title: '操作时间',
sortable: true
}, },
{ {
title: '操作', title: '操作',
...@@ -153,12 +155,6 @@ ...@@ -153,12 +155,6 @@
var url = prefix + '/detail/' + id; var url = prefix + '/detail/' + id;
$.modal.open("操作日志详细", url); $.modal.open("操作日志详细", url);
} }
layui.use('laydate', function() {
var laydate = layui.laydate;
laydate.render({ elem: '#startTime', theme: 'molv' });
laydate.render({ elem: '#endTime', theme: 'molv' });
});
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -22,6 +22,12 @@ ...@@ -22,6 +22,12 @@
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select> </select>
</li> </li>
<li class="time">
<label>创建时间: </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a> <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a>
...@@ -94,7 +100,7 @@ ...@@ -94,7 +100,7 @@
} }
}, },
{ {
field: 'createDateTimeStr', field: 'createTime',
title: '创建时间' title: '创建时间'
}, },
{ {
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
} }
}, },
{ {
field: 'createTimeStr', field: 'createTime',
title: '创建时间', title: '创建时间',
align: "center" align: "center"
}, },
......
...@@ -104,8 +104,9 @@ ...@@ -104,8 +104,9 @@
title: '备注' title: '备注'
}, },
{ {
field: 'createDateTimeStr', field: 'createTime',
title: '创建时间' title: '创建时间',
sortable: true
}, },
{ {
title: '操作', title: '操作',
......
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select> </select>
</li> </li>
<li class="time">
<label>创建时间: </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a> <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a>
...@@ -102,8 +108,9 @@ ...@@ -102,8 +108,9 @@
title: '备注' title: '备注'
}, },
{ {
field: 'createDateTimeStr', field: 'createTime',
title: '创建时间' title: '创建时间',
sortable: true
}, },
{ {
title: '操作', title: '操作',
......
...@@ -98,8 +98,9 @@ ...@@ -98,8 +98,9 @@
title : '创建者' title : '创建者'
}, },
{ {
field: 'createDateTimeStr', field: 'createTime',
title: '创建时间' title: '创建时间',
sortable: true
}, },
{ {
title: '操作', title: '操作',
......
...@@ -98,8 +98,9 @@ ...@@ -98,8 +98,9 @@
} }
}, },
{ {
field: 'createDateTimeStr', field: 'createTime',
title: '创建时间' title: '创建时间',
sortable: true
}, },
{ {
title: '操作', title: '操作',
......
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select> </select>
</li> </li>
<li class="time">
<label>创建时间: </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a> <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a>
...@@ -99,7 +105,8 @@ ...@@ -99,7 +105,8 @@
}, },
{ {
field: 'createTime', field: 'createTime',
title: '创建时间' title: '创建时间',
sortable: true
}, },
{ {
title: '操作', title: '操作',
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<p><i class="fa fa-group"></i> [[${user.dept.deptName}]] / [[${#strings.defaultString(postGroup,'无岗位')}]]</p> <p><i class="fa fa-group"></i> [[${user.dept.deptName}]] / [[${#strings.defaultString(postGroup,'无岗位')}]]</p>
<p><i class="fa fa-transgender"></i> [[${user.sex}]]</p> <p><i class="fa fa-transgender"></i> [[${user.sex}]]</p>
<p><i class="fa fa-envelope-o"></i> [[${user.email}]]</p> <p><i class="fa fa-envelope-o"></i> [[${user.email}]]</p>
<p><i class="fa fa-calendar"></i> [[${user.createTimeStr}]]</p> <p><i class="fa fa-calendar"></i> [[${#dates.format(user.createTime, 'yyyy-MM-dd HH:mm:ss')}]]</p>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</a> </a>
......
...@@ -48,6 +48,12 @@ ...@@ -48,6 +48,12 @@
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option> <option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select> </select>
</li> </li>
<li class="time">
<label>创建时间: </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a> <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a>
...@@ -139,8 +145,9 @@ ...@@ -139,8 +145,9 @@
} }
}, },
{ {
field: 'createDateTimeStr', field: 'createTime',
title: '创建时间' title: '创建时间',
sortable: true
}, },
{ {
title: '操作', title: '操作',
......
...@@ -16,6 +16,12 @@ ...@@ -16,6 +16,12 @@
<li> <li>
表描述:<input type="text" name="tableComment"/> 表描述:<input type="text" name="tableComment"/>
</li> </li>
<li class="time">
<label>创建时间: </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
</li> </li>
...@@ -50,22 +56,31 @@ ...@@ -50,22 +56,31 @@
}, },
{ {
field: 'tableName', field: 'tableName',
title: '表名称' title: '表名称',
width: '20%',
sortable: true
}, },
{ {
field: 'tableComment', field: 'tableComment',
title: '表描述' title: '表描述',
width: '20%',
sortable: true
}, },
{ {
field: 'createDateTimeStr', field: 'createTime',
title: '创建时间' title: '创建时间',
width: '20%',
sortable: true
}, },
{ {
field: 'updateDateTimeStr', field: 'updateTime',
title: '更新时间' title: '更新时间',
width: '20%',
sortable: true
}, },
{ {
title: '操作', title: '操作',
width: '20%',
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var msg = '<a class="btn btn-primary btn-xs" href="#" onclick="genCode(\'' + row.tableName + '\')"><i class="fa fa-bug"></i>生成代码</a> '; var msg = '<a class="btn btn-primary btn-xs" href="#" onclick="genCode(\'' + row.tableName + '\')"><i class="fa fa-bug"></i>生成代码</a> ';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment