Merge remote-tracking branch 'origin/master'

jiangping

2023-12-05 766089ad50ae807ab88ba83b2dbc4a53bda8e423

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

@@ -6,6 +6,8 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.MemberService;
import io.swagger.annotations.Api;
@@ -38,6 +40,14 @@
        return ApiResponse.success(memberService.create(member));
    }

    @PreventRepeat
    @ApiOperation("创建劳务人员信息")
    @PostMapping("/laborMemberCreate")
    @RequiresPermissions("business:member:create")
    public ApiResponse<Integer> laborMemberCreate(@RequestBody LaborMemberDTO member){
        return ApiResponse.success(memberService.laborMemberCreate(member));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:member:delete")
@@ -67,6 +77,14 @@
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID 禁启用 拉黑")
    @PostMapping("/updateStatusById")
    @RequiresPermissions("business:member:update")
    public ApiResponse updateStatusById(@RequestBody Member member){
        memberService.updateStatusById(member);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:member:query")
@@ -74,6 +92,13 @@
        return ApiResponse.success(memberService.findPage(pageWrap));
    }

    @ApiOperation("分页劳务用户信息查询")
    @PostMapping("/findLaborMemberInfoPage")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<MemberInfoDTO>> findLaborMemberInfoPage(@RequestBody PageWrap<MemberInfoDTO> pageWrap){
        return ApiResponse.success(memberService.findLaborMemberInfoPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:member:exportExcel")