From a69578ed877252e70d45d4753258b3d7b6937606 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:24:34 +0800
Subject: [PATCH] a
---
server/src/main/java/doumeemes/api/system/SystemLoginLogController.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
index 00e7705..396d18f 100644
--- a/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
+++ b/server/src/main/java/doumeemes/api/system/SystemLoginLogController.java
@@ -6,10 +6,14 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.core.utils.DateUtil;
+<<<<<<< HEAD
import doumeemes.dao.business.model.Backorder;
import doumeemes.dao.business.vo.WorkPlansVO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
import doumeemes.dao.ext.dto.QueryWorkPlansDTO;
+=======
+import doumeemes.dao.ext.dto.CompanyLoginDTO;
+>>>>>>> 1.0.3
import doumeemes.dao.ext.vo.CompanyLoginStatisticsVO;
import doumeemes.dao.system.dto.QuerySystemLoginLogDTO;
import doumeemes.dao.system.model.SystemLoginLog;
@@ -50,6 +54,24 @@
@RequiresPermissions("system:loginLog:query")
public void export (@RequestBody PageWrap<QuerySystemLoginLogDTO> pageWrap, HttpServletResponse response) {
ExcelExporter.build(SystemLoginLog.class).exportWithFirstAndEnd(systemLoginLogService.findPage(pageWrap).getRecords(), "鐧诲綍鏃ュ織_"+System.currentTimeMillis(),"鐧诲綍鏃ュ織-"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+<<<<<<< HEAD
+=======
+ }
+
+
+ @PostMapping("/companyLoginStatisticsPage")
+ @ApiOperation("浼佷笟鐧诲綍缁熻")
+// @RequiresPermissions("system:loginLog:query")
+ public ApiResponse<PageData<CompanyLoginStatisticsVO>> companyLoginStatisticsPage (@RequestBody PageWrap<CompanyLoginDTO> pageWrap) {
+ return ApiResponse.success(systemUserService.companyLoginStatisticsPage(pageWrap));
+ }
+
+ @PostMapping("/companyLoginStatisticsExport")
+ @ApiOperation("浼佷笟鐧诲綍缁熻瀵煎嚭")
+// @RequiresPermissions("system:loginLog:query")
+ public void companyLoginStatisticsExport (@RequestBody PageWrap<CompanyLoginDTO> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "浼佷笟鐧诲綍缁熻_"+System.currentTimeMillis(),"浼佷笟鐧诲綍缁熻_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+>>>>>>> 1.0.3
}
--
Gitblit v1.9.3