gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日志管理-优化结束时间不超过当前系统时间

Browse Source
This commit is contained in:
leijun
2018-12-29 11:45:51 +08:00
parent 7b74a233fb
commit b5ec00de90
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/nis/web/service/LogService.java
View File

@@ -15,27 +15,24 @@ public class LogService extends CrudService<SysLogDao, SysLog> {
@Autowired
protected SysLogDao sysLogDao;
public Page<SysLog> findPage(Page<SysLog> page, SysLog sysLog) {
// 设置默认时间范围，默认当前月
if (sysLog.getBeginDate() == null){
sysLog.setBeginDate(DateUtils.setDays(DateUtils.parseDate(DateUtils.getDate()), 1));
}
if (sysLog.getEndDate() == null){
sysLog.setEndDate(DateUtils.addMonths(sysLog.getBeginDate(), 1));
sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDateTime()));
}
if (sysLog.getBeginDate() == null){
sysLog.setBeginDate(DateUtils.addMonths(sysLog.getEndDate(), -1));
}
return super.findPage(page, sysLog);
}
public Page<SysLog> findCfgOperationLogPage(Page<SysLog> page, SysLog sysLog) {
// 设置默认时间范围，默认当前月
if (sysLog.getBeginDate() == null){
sysLog.setBeginDate(DateUtils.setDays(DateUtils.parseDate(DateUtils.getDate()), 1));
}
if (sysLog.getEndDate() == null){
sysLog.setEndDate(DateUtils.addMonths(sysLog.getBeginDate(), 1));
sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDateTime()));
}
if (sysLog.getBeginDate() == null){
sysLog.setBeginDate(DateUtils.addMonths(sysLog.getEndDate(), -1));
}
sysLog.setPage(page);
List<SysLog> list = sysLogDao.findCfgOperationLogList(sysLog);