Merge remote-tracking branch 'origin/master'

lishuai

2023-12-26 70577a6d6cf2bded29e71dcad11a0c2605193d20

 server/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java

@@ -6,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.admin.request.RetentionQuery;
import com.doumee.dao.business.model.Retention;
import com.doumee.service.business.RetentionService;
import io.swagger.annotations.Api;
@@ -20,7 +21,7 @@

/**
 * @author 江蹄蹄
 * @date 2023/11/23 18:16
 * @date 2023/11/30 15:33
 */
@Api(tags = "在厂人员信息 表（滞留）")
@RestController
@@ -69,14 +70,14 @@

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:retention:query")
    //@RequiresPermissions("business:retention:query")
    public ApiResponse<PageData<Retention>> findPage (@RequestBody PageWrap<Retention> pageWrap) {
        return ApiResponse.success(retentionService.findPage(pageWrap));
        return ApiResponse.success(retentionService.findTrainTimePage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:retention:exportExcel")
    //@RequiresPermissions("business:retention:exportExcel")
    public void exportExcel (@RequestBody PageWrap<Retention> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(Retention.class).export(retentionService.findPage(pageWrap).getRecords(), "在厂人员信息 表（滞留）", response);
    }