Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

k94314517

2025-02-28 25908f5bd4a2dae4625b49d325525849feb676a4

 server/platform/src/main/java/com/doumee/api/business/ActionLogController.java

@@ -6,7 +6,9 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.ActionLog;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.service.business.ActionLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -73,6 +75,12 @@
    public ApiResponse<PageData<ActionLog>> findPage (@RequestBody PageWrap<ActionLog> pageWrap) {
        return ApiResponse.success(actionLogService.findPage(pageWrap));
    }
    @ApiOperation("分页查询-调整记录")
    @PostMapping("/findRidePae")
    @RequiresPermissions("business:actionlog:query")
    public ApiResponse<PageData<ActionLog>> findRidePae (@RequestBody PageWrap<ActionLog> pageWrap) {
        return ApiResponse.success(actionLogService.findRidePae(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
@@ -80,6 +88,13 @@
    public void exportExcel (@RequestBody PageWrap<ActionLog> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(ActionLog.class).export(actionLogService.findPage(pageWrap).getRecords(), "系统行为操作记录表", response);
    }
    @ApiOperation("导出调整记录Excel")
    @PostMapping("/exportRideExcel")
    @RequiresPermissions("business:actionlog:exportExcel")
    public void exportRideExcel (@RequestBody PageWrap<ActionLog> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(ActionLog.class).exportWithFirstAndEnd(actionLogService.findRidePae(pageWrap).getRecords(), "调整记录_"+System.currentTimeMillis(),"调整记录_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);

    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")