From 99b4bac8059eb61a45ad0b29a84aebe184ba9711 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 24 十月 2024 10:04:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LogBasicServiceImpl.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LogBasicServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LogBasicServiceImpl.java
index 5e6b4fc..96b9519 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LogBasicServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/LogBasicServiceImpl.java
@@ -204,8 +204,16 @@
*/
@Override
public String exportLogs(LogQueryCriteriaDTO dto) throws PLException{
- BaseResult logListByContion = this.getLogListByContion(dto);
- Collection<LogInfoDTO> logList = logListByContion.getData();
+ VciBaseUtil.alertNotNull(dto,"鏃ュ織鏌ヨ鍙傛暟瀵硅薄");
+ List<String> userNameList = userQueryServiceI.queryUserNameByRoleType(dto.getRoleType());
+ dto.setUserNameList(userNameList);
+ String querySql = getSQL(dto);
+ //鍏ㄦ煡璇�
+ if(dto.getPageSize() == -1){
+ long sumLogRows = platformClientUtil.getLogService().getSumLogRows(querySql);
+ dto.setPageSize((int) sumLogRows);
+ }
+ LogInfo[] logList = platformClientUtil.getLogService().getLogListByContion(dto.getPageNo(),dto.getPageSize(),querySql);
//鐣岄潰娌′紶鍚嶇О锛屼娇鐢ㄩ粯璁ゅ鍑哄悕绉�
String exportFileName = "鏃ュ織瀵煎嚭_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss");
@@ -233,15 +241,15 @@
}else{
//鍏堟寜鐓у睘鎬х被鍨嬫帓搴忥紝涓嶅悓灞炴�х被鍨嬪鍑虹殑鏁版嵁涔辩殑鏁堟灉
AtomicInteger i = new AtomicInteger();
- logList.stream().forEach(log->{
- excelDataList.add(new WriteExcelData(i.get() +1,0, log.getUsername()));
- excelDataList.add(new WriteExcelData(i.get() +1,1, log.getTruename()));
- excelDataList.add(new WriteExcelData(i.get() +1,2, log.getUserIp()));
- excelDataList.add(new WriteExcelData(i.get() +1,3, log.getModuleName()));
- excelDataList.add(new WriteExcelData(i.get() +1,4, log.getType()));
- excelDataList.add(new WriteExcelData(i.get() +1,5, log.getDate()));
- excelDataList.add(new WriteExcelData(i.get() +1,6, log.getLogType()));
- excelDataList.add(new WriteExcelData(i.get() +1,7, log.getResult()));
+ Arrays.stream(logList).forEach(log->{
+ excelDataList.add(new WriteExcelData(i.get() +1,0, log.username));
+ excelDataList.add(new WriteExcelData(i.get() +1,1, log.truename));
+ excelDataList.add(new WriteExcelData(i.get() +1,2, log.userIp));
+ excelDataList.add(new WriteExcelData(i.get() +1,3, log.moduleName));
+ excelDataList.add(new WriteExcelData(i.get() +1,4, log.type));
+ excelDataList.add(new WriteExcelData(i.get() +1,5, log.date));
+ excelDataList.add(new WriteExcelData(i.get() +1,6, log.logType));
+ excelDataList.add(new WriteExcelData(i.get() +1,7, log.result));
i.getAndIncrement();
});
}
--
Gitblit v1.9.3