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

多媒体、IP复用、增加导出excel和csv

Browse Source
This commit is contained in:
leijun
2018-12-23 00:36:58 +08:00
parent 9080960e95
commit df32c39736
42 changed files with 730 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -2071,30 +2071,25 @@ public class BaseController {
titleTime+=" "+msgProp.getProperty("config_time")+"："+DateUtils.formatDateTime(cfg.getSearch_create_time_start());
if(cfg.getSearch_create_time_end()!=null){
titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_create_time_end());
}
}else{
if(cfg.getSearch_create_time_end()!=null){
titleTime+=" "+msgProp.getProperty("config_time")+"：—"+DateUtils.formatDateTime(cfg.getSearch_create_time_end());
}else{
titleTime+="—"+DateUtils.getDateTime();
}
}
if(cfg.getSearch_edit_time_start()!=null){
titleTime+=" "+msgProp.getProperty("edit_time")+"："+DateUtils.formatDateTime(cfg.getSearch_edit_time_start());
if(cfg.getSearch_edit_time_end()!=null){
titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_edit_time_end());
}
}else{
if(cfg.getSearch_edit_time_end()!=null){
titleTime+=" "+msgProp.getProperty("edit_time")+"：—"+DateUtils.formatDateTime(cfg.getSearch_edit_time_end());
}else{
titleTime+="—"+DateUtils.getDateTime();
}
}
if(cfg.getSearch_audit_time_start()!=null){
titleTime+=" "+msgProp.getProperty("audit_time")+"："+DateUtils.formatDateTime(cfg.getSearch_audit_time_start());
if(cfg.getSearch_audit_time_end()!=null){
titleTime+="—"+DateUtils.formatDateTime(cfg.getSearch_audit_time_end());
}
}else{
if(cfg.getSearch_audit_time_end()!=null){
titleTime+=" "+msgProp.getProperty("audit_time")+"： —"+DateUtils.formatDateTime(cfg.getSearch_audit_time_end());
}else{
titleTime+="—"+DateUtils.getDateTime();
}
}
return titleTime;