manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

访问日志去掉日期范围查询条件

Browse Source
This commit is contained in:
thinkgem
2018-08-21 21:33:00 +08:00
parent 145e0b6b07
commit 596b1245d9
3 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/core/src/main/java/com/jeesite/modules/sys/service/LogService.java
View File

@@ -3,14 +3,11 @@
*/ */
package com.jeesite.modules.sys.service; package com.jeesite.modules.sys.service;
import java.util.Date;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.jeesite.common.entity.Page; import com.jeesite.common.entity.Page;
import com.jeesite.common.lang.DateUtils;
import com.jeesite.common.service.CrudService; import com.jeesite.common.service.CrudService;
import com.jeesite.modules.sys.dao.LogDao; import com.jeesite.modules.sys.dao.LogDao;
import com.jeesite.modules.sys.entity.Log; import com.jeesite.modules.sys.entity.Log;
@@ -29,20 +26,17 @@ public class LogService extends CrudService<LogDao, Log> {
*/ */
@Override @Override
public Page<Log> findPage(Page<Log> page, Log log) { public Page<Log> findPage(Page<Log> page, Log log) {
// // 设置默认时间范围，默认当前月
// 设置默认时间范围，默认当前月 // if (log.getCreateDate_gte() == null){
if (log.getCreateDate_gte() == null){ // log.setCreateDate_gte(DateUtils.setDays(new Date(), 1));
log.setCreateDate_gte(DateUtils.setDays(new Date(), 1)); // }
} // if (log.getCreateDate_lte() == null){
if (log.getCreateDate_lte() == null){ // log.setCreateDate_lte(DateUtils.addDays(DateUtils.addMonths(log.getCreateDate_gte(), 1), -1));
log.setCreateDate_lte(DateUtils.addDays(DateUtils.addMonths(log.getCreateDate_gte(), 1), -1)); // }
}
// 普通用户看自己的，管理员看全部的。 // 普通用户看自己的，管理员看全部的。
if (!log.getCurrentUser().isAdmin()){ if (!log.getCurrentUser().isAdmin()){
log.setCreateBy(log.getCurrentUser().getUserCode()); log.setCreateBy(log.getCurrentUser().getUserCode());
} }
return super.findPage(page, log); return super.findPage(page, log);
} }

17
modules/core/src/main/java/com/jeesite/modules/sys/web/LogController.java
View File

@@ -3,8 +3,6 @@
*/ */
package com.jeesite.modules.sys.web; package com.jeesite.modules.sys.web;
import java.util.Date;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@@ -18,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.jeesite.common.entity.Page; import com.jeesite.common.entity.Page;
import com.jeesite.common.lang.DateUtils;
import com.jeesite.common.web.BaseController; import com.jeesite.common.web.BaseController;
import com.jeesite.modules.sys.entity.Log; import com.jeesite.modules.sys.entity.Log;
import com.jeesite.modules.sys.service.LogService; import com.jeesite.modules.sys.service.LogService;
@@ -50,13 +47,13 @@ public class LogController extends BaseController {
@RequiresPermissions("sys:log:view") @RequiresPermissions("sys:log:view")
@RequestMapping(value = "list") @RequestMapping(value = "list")
public String list(Log log, Model model) { public String list(Log log, Model model) {
// 设置默认时间范围，默认当前月 // // 设置默认时间范围，默认当前月
if (log.getCreateDate_gte() == null){ // if (log.getCreateDate_gte() == null){
log.setCreateDate_gte(DateUtils.setDays(new Date(), 1)); // log.setCreateDate_gte(DateUtils.setDays(new Date(), 1));
} // }
if (log.getCreateDate_lte() == null){ // if (log.getCreateDate_lte() == null){
log.setCreateDate_lte(DateUtils.addDays(DateUtils.addMonths(log.getCreateDate_gte(), 1), -1)); // log.setCreateDate_lte(DateUtils.addDays(DateUtils.addMonths(log.getCreateDate_gte(), 1), -1));
} // }
model.addAttribute("log", log); model.addAttribute("log", log);
return "modules/sys/logList"; return "modules/sys/logList";
} }

4
modules/core/src/main/resources/views/modules/sys/logList.html
View File

@@ -61,10 +61,10 @@
<label class="control-label">操作时间：</label> <label class="control-label">操作时间：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="createDate_gte" readonly="readonly" maxlength="20" class="form-control Wdate-date" <#form:input path="createDate_gte" readonly="readonly" maxlength="20" class="form-control Wdate-date"
dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false,onpicked:function(){createDate_lte.click()}});"/> dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true,onpicked:function(){createDate_lte.click()}});"/>
&nbsp;--&nbsp; &nbsp;--&nbsp;
<#form:input path="createDate_lte" readonly="readonly" maxlength="20" class="form-control Wdate-date" <#form:input path="createDate_lte" readonly="readonly" maxlength="20" class="form-control Wdate-date"
dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">