Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

5 天以前 0d7d874912d0147376826b55667a1deb6547ed91

 src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java

@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper;
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
import com.ruoyi.warehouse.pojo.DocumentationReturnManagement;
@@ -30,64 +30,64 @@
    @GetMapping("/listPage")
    @Operation(summary = "文档借阅管理-借阅分页查询")
    @Log(title = "文档借阅管理-借阅分页查询", businessType = BusinessType.OTHER)
    public AjaxResult listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
        return AjaxResult.success(documentationBorrowManagementService.listPage(page, documentationBorrowManagement));
    public R<?> listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
        return R.ok(documentationBorrowManagementService.listPage(page, documentationBorrowManagement));
    }
    @GetMapping("/list")
    @Operation(summary = "文档借阅管理-借阅查询")
    @Log(title = "文档借阅管理-借阅查询", businessType = BusinessType.OTHER)
    public AjaxResult list() {
        return AjaxResult.success(documentationBorrowManagementService.listAll());
    public R<?> list() {
        return R.ok(documentationBorrowManagementService.listAll());
    }
    @GetMapping("/listPageReturn")
    @Operation(summary = "文档借阅管理-归还分页查询")
    @Log(title = "文档借阅管理-归还分页查询", businessType = BusinessType.OTHER)
    public AjaxResult listPageReturn(Page page, DocumentationReturnManagement documentationReturnManagement) {
        return AjaxResult.success(documentationReturnManagementMapper.listPage(page, documentationReturnManagement));
    public R<?> listPageReturn(Page page, DocumentationReturnManagement documentationReturnManagement) {
        return R.ok(documentationReturnManagementMapper.listPage(page, documentationReturnManagement));
    }
    @GetMapping("/getByDocumentationId/{id}")
    @Operation(summary = "根据书籍id查询借阅记录")
    @Log(title = "根据书籍id查询借阅记录", businessType = BusinessType.OTHER)
    public AjaxResult getByDocumentationId(@PathVariable Long id) {
        return AjaxResult.success(documentationBorrowManagementService.selectByDocumentationId(id));
    public R<?> getByDocumentationId(@PathVariable Long id) {
        return R.ok(documentationBorrowManagementService.selectByDocumentationId(id));
    }
    @PostMapping("/add")
    @Operation(summary = "文档借阅管理-借阅")
    @Log(title = "文档借阅管理-借阅", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
        return AjaxResult.success(documentationBorrowManagementService.add(documentationBorrowManagement));
    public R<?> add(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
        return R.ok(documentationBorrowManagementService.add(documentationBorrowManagement));
    }
    @PutMapping("/revent")
    @Operation(summary = "文档借阅管理-归还")
    @Log(title = "文档借阅管理-归还", businessType = BusinessType.UPDATE)
    public AjaxResult revent(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
        return AjaxResult.success(documentationBorrowManagementService.reventdbm(documentationReturnManagement));
    public R<?> revent(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
        return R.ok(documentationBorrowManagementService.reventdbm(documentationReturnManagement));
    }
    @PutMapping("/update")
    @Operation(summary = "文档借阅管理-更新")
    @Log(title = "文档借阅管理-更新", businessType = BusinessType.UPDATE)
    public AjaxResult update(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
        return AjaxResult.success(documentationBorrowManagementService.updateById(documentationBorrowManagement));
    public R<?> update(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
        return R.ok(documentationBorrowManagementService.updateById(documentationBorrowManagement));
    }
    @PutMapping("/reventUpdate")
    @Operation(summary = "文档借阅管理-归还更新")
    @Log(title = "文档借阅管理-归还更新", businessType = BusinessType.UPDATE)
    public AjaxResult reventupdate(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
        return AjaxResult.success(documentationReturnManagementMapper.updateById(documentationReturnManagement));
    public R<?> reventupdate(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
        return R.ok(documentationReturnManagementMapper.updateById(documentationReturnManagement));
    }
    @DeleteMapping ("/delete")
    @Operation(summary = "文档借阅管理-借阅删除")
    @Log(title = "文档借阅管理-借阅删除", businessType = BusinessType.DELETE)
    public AjaxResult delete(@RequestBody List<Long> ids) {
        if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("请传入要删除的ID");
        return AjaxResult.success(documentationBorrowManagementService.deleteByIds(ids));
    public R<?> delete(@RequestBody List<Long> ids) {
        if(CollectionUtils.isEmpty(ids)) return R.fail("请传入要删除的ID");
        return R.ok(documentationBorrowManagementService.deleteByIds(ids));
    }
    @DeleteMapping ("/reventDelete")
    @Operation(summary = "文档借阅管理-归还删除")
    @Log(title = "文档借阅管理-归还删除", businessType = BusinessType.DELETE)
    public AjaxResult reventdelete(@RequestBody List<Long> ids) {
        if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("请传入要删除的ID");
        return AjaxResult.success(documentationBorrowManagementService.reventDeleteByIds(ids));
    public R<?> reventdelete(@RequestBody List<Long> ids) {
        if(CollectionUtils.isEmpty(ids)) return R.fail("请传入要删除的ID");
        return R.ok(documentationBorrowManagementService.reventDeleteByIds(ids));
    }
    @PostMapping("/export")
    @Operation(summary = "文档借阅管理-借阅导出")