bug

jiangping

2023-11-07 64b432916af9c9218ab3f3eca614e26c542142ae

 server/src/main/java/doumeemes/api/system/SystemLoginLogController.java

@@ -7,20 +7,7 @@
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
import doumeemes.core.utils.DateUtil;
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> dev
import doumeemes.dao.business.model.Backorder;
import doumeemes.dao.business.vo.WorkPlansVO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
import doumeemes.dao.ext.dto.QueryWorkPlansDTO;
<<<<<<< HEAD
=======
import doumeemes.dao.ext.dto.CompanyLoginDTO;
>>>>>>> 1.0.3
=======
>>>>>>> dev
import doumeemes.dao.ext.vo.CompanyLoginStatisticsVO;
import doumeemes.dao.system.dto.QuerySystemLoginLogDTO;
import doumeemes.dao.system.model.SystemLoginLog;
@@ -61,8 +48,6 @@
    @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
=======
    }


@@ -77,31 +62,8 @@
    @ApiOperation("企业登录统计导出")
//    @RequiresPermissions("system:loginLog:query")
    public void companyLoginStatisticsExport (@RequestBody PageWrap<CompanyLoginDTO> pageWrap, HttpServletResponse response) {
<<<<<<< HEAD
        ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "企业登录统计_"+System.currentTimeMillis(),"企业登录统计_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
>>>>>>> 1.0.3
    }


    @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(),"企业登录统计",null, response);
        ExcelExporter.build(CompanyLoginStatisticsVO.class).export(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "企业登录统计_"+System.currentTimeMillis(), response);
    }

=======
        //ExcelExporter.build(CompanyLoginStatisticsVO.class).exportWithFirstAndEnd(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "企业登录统计_"+System.currentTimeMillis(),"企业登录统计",null, response);
        ExcelExporter.build(CompanyLoginStatisticsVO.class).export(systemUserService.companyLoginStatisticsPage(pageWrap).getRecords(), "企业登录统计_"+System.currentTimeMillis(), response);
    }

>>>>>>> dev
}