Merge remote-tracking branch 'origin/master'

jiangping

2024-01-31 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa

 server/company/src/main/java/com/doumee/api/business/ApplyDetailController.java

@@ -72,14 +72,22 @@
    @PostMapping("/page")
    @RequiresPermissions("business:applydetail:query")
    public ApiResponse<PageData<ApplyDetail>> findPage (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap) {
        return ApiResponse.success(applyDetailService.findPage(pageWrap));
        return ApiResponse.success(applyDetailService.findPageForCompany(pageWrap));
    }

    @ApiOperation("导出Excel")
    @ApiOperation("列表查询")
    @PostMapping("/findList")
    @RequiresPermissions("business:applydetail:query")
    public ApiResponse<List<ApplyDetail>> findList (@RequestBody ApplyDetailPageDTO applyDetailPageDTO) {
        return ApiResponse.success(applyDetailService.findListForCompany(applyDetailPageDTO));
    }

    @ApiOperation("导出在保人员详单Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:applydetail:exportExcel")
    public void exportExcel (@RequestBody PageWrap<ApplyDetailPageDTO> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(ApplyDetail.class).export(applyDetailService.findPage(pageWrap).getRecords(), "投保申请明细信息表", response);
        //List<T> data, String fileName,String first,String end, HttpServletResponse response
        ExcelExporter.build(ApplyDetail.class).exportWithFirstAndEnd(applyDetailService.findPageForCompany(pageWrap).getRecords(), pageWrap.getModel().getSolutionName()+".xlsx","在保人员名单",null, response);
    }

    @ApiOperation("根据ID查询")
@@ -88,4 +96,15 @@
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(applyDetailService.findById(id));
    }


    @ApiOperation("查询员工投保记录")
    @GetMapping("/getMemberApplyList")
    public ApiResponse<List<ApplyDetail>> getMemberApplyList(@RequestParam Integer memberId) {
        return ApiResponse.success(applyDetailService.getMemberApplyList(memberId));
    }




}