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

日志管理修复当天操作日志无法查询bug；

Browse Source 
所有业务的规则描述增加非空校验
This commit is contained in:
duandongmei
2019-01-08 21:29:48 +06:00
parent 65728f0254
commit e853c1d360
14 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,11 @@ public class LogService extends CrudService<SysLogDao, SysLog> {
public Page<SysLog> findPage(Page<SysLog> page, SysLog sysLog) {
// 设置默认时间范围，默认当前月
if (sysLog.getEndDate() == null){
sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDate()));
sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDate("yyyy-MM-dd HH:mm:ss")));
}else{
sysLog.setEndDate(DateUtils.setHours(sysLog.getEndDate(), 23));
sysLog.setEndDate(DateUtils.setMinutes(sysLog.getEndDate(), 59));
sysLog.setEndDate(DateUtils.setSeconds(sysLog.getEndDate(), 59));
}
if (sysLog.getBeginDate() == null){
sysLog.setBeginDate(DateUtils.addMonths(sysLog.getEndDate(), -1));
@@ -29,7 +33,11 @@ public class LogService extends CrudService<SysLogDao, SysLog> {
public Page<SysLog> findCfgOperationLogPage(Page<SysLog> page, SysLog sysLog) {
// 设置默认时间范围，默认当前月
if (sysLog.getEndDate() == null){
sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDate()));
sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDate("yyyy-MM-dd HH:mm:ss")));
}else{
sysLog.setEndDate(DateUtils.setHours(sysLog.getEndDate(), 23));
sysLog.setEndDate(DateUtils.setMinutes(sysLog.getEndDate(), 59));
sysLog.setEndDate(DateUtils.setSeconds(sysLog.getEndDate(), 59));
}
if (sysLog.getBeginDate() == null){
sysLog.setBeginDate(DateUtils.addMonths(sysLog.getEndDate(), -1));