修改完善3

yaowanxin

3 天以前 8f4db901aa772a808c243f8a4e39522f6f09d5da

 src/main/java/com/ruoyi/warehouse/service/impl/DocumentationBorrowManagementServiceImpl.java

@@ -8,8 +8,10 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto;
import com.ruoyi.warehouse.dto.ReturnExportDto;
import com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper;
import com.ruoyi.warehouse.pojo.Documentation;
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
import com.ruoyi.warehouse.pojo.DocumentationReturnManagement;
import com.ruoyi.warehouse.service.DocumentationBorrowManagementService;
import com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper;
import com.ruoyi.warehouse.service.DocumentationService;
@@ -35,6 +37,8 @@
    @Autowired
    private DocumentationBorrowManagementMapper documentationBorrowManagementMapper;
    @Autowired
    private DocumentationReturnManagementMapper documentationReturnManagementMapper;
    @Autowired
    private DocumentationService documentationService;
    @Override
    public IPage<DocumentationBorrowManagement> listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
@@ -45,6 +49,7 @@

    @Override
    public boolean add(DocumentationBorrowManagement documentationBorrowManagement) {
        documentationBorrowManagement.setBorrowStatus("借阅");
        documentationBorrowManagementMapper.insert(documentationBorrowManagement);
        Documentation documentation = documentationService.getById(documentationBorrowManagement.getDocumentationId());
        documentation.setDocStatus("借出");
@@ -52,15 +57,29 @@
        return true;
    }
    @Override
    public boolean reventdbm(DocumentationBorrowManagement documentationBorrowManagement) {
    public boolean reventdbm(DocumentationReturnManagement documentationReturnManagement) {
        // 更新借阅记录状态为归还
        DocumentationBorrowManagement documentationBorrowManagement1 = documentationBorrowManagementMapper.selectById(documentationBorrowManagement.getId());
        documentationBorrowManagement1.setReturner(documentationBorrowManagement.getReturner());
        DocumentationBorrowManagement documentationBorrowManagement1 = documentationBorrowManagementMapper.selectById(documentationReturnManagement.getBorrowId());

        DocumentationReturnManagement returnManagement = new DocumentationReturnManagement();
        returnManagement.setDocumentationId(documentationBorrowManagement1.getDocumentationId());
        returnManagement.setBorrower(documentationBorrowManagement1.getBorrower());
        returnManagement.setBorrowPurpose(documentationBorrowManagement1.getBorrowPurpose());
        returnManagement.setBorrowDate(documentationBorrowManagement1.getBorrowDate());
        returnManagement.setDueReturnDate(documentationBorrowManagement1.getDueReturnDate());
        returnManagement.setBorrowStatus("归还");
        returnManagement.setBorrowId(documentationReturnManagement.getBorrowId());
        returnManagement.setReturner(documentationReturnManagement.getReturner());
        returnManagement.setReturnDate(LocalDate.now());
        returnManagement.setRemark(documentationReturnManagement.getRemark());

        documentationReturnManagementMapper.insert(returnManagement);
        documentationBorrowManagement1.setBorrowStatus("归还");
        documentationBorrowManagement1.setReturner(documentationReturnManagement.getReturner());
        documentationBorrowManagement1.setReturnDate(LocalDate.now());
        documentationBorrowManagementMapper.updateById(documentationBorrowManagement1);
        // 更新文档状态为正常
        Documentation documentation = documentationService.getById(documentationBorrowManagement.getDocumentationId());
        Documentation documentation = documentationService.getById(documentationBorrowManagement1.getDocumentationId());
        documentation.setDocStatus("正常");
        documentationService.updateById(documentation);
        return true;
@@ -68,25 +87,29 @@

    @Override
    public boolean reventDeleteByIds(List<Long> ids) {
        QueryWrapper<DocumentationBorrowManagement> queryWrapper = new QueryWrapper<>();
        QueryWrapper<DocumentationReturnManagement> queryWrapper = new QueryWrapper<>();
        queryWrapper.in("id", ids);
        queryWrapper.eq("borrow_status", "归还");
        List<DocumentationBorrowManagement> list = documentationBorrowManagementMapper.selectList(queryWrapper);
        for (DocumentationBorrowManagement documentationBorrowManagement : list) {
//        queryWrapper.eq("borrow_status", "归还");
        List<DocumentationReturnManagement> list = documentationReturnManagementMapper.selectList(queryWrapper);

        for (DocumentationReturnManagement documentationReturnManagement : list) {

            try {
                documentationReturnManagementMapper.deleteById(documentationReturnManagement);
                DocumentationBorrowManagement documentationBorrowManagement = documentationBorrowManagementMapper.selectById(documentationReturnManagement.getBorrowId());
                documentationBorrowManagement.setBorrowStatus("借阅");
                documentationBorrowManagement.setReturner(null);
                documentationBorrowManagement.setReturnDate(null);
                documentationBorrowManagementMapper.updateById(documentationBorrowManagement);

                Documentation documentation = documentationService.getById(documentationBorrowManagement.getDocumentationId());
                if (documentation != null) {
                Documentation documentation = documentationService.getById(documentationReturnManagement.getDocumentationId());
                    documentation.setDocStatus("借出");
                    documentationService.updateById(documentation);
                }
            } catch (Exception e) {
                throw new RuntimeException("更新借阅记录和文档状态时出错", e);
                throw new RuntimeException("删除归还记录和文档状态时出错", e);
            }
        }
//        documentationReturnManagementMapper.deleteBatchIds(ids);
        return true;
    }

@@ -98,10 +121,15 @@
    }

    @Override
    public void exportrevent(HttpServletResponse response, DocumentationBorrowManagement documentationBorrowManagement) {
        List<ReturnExportDto> documentationBorrowManagements = documentationBorrowManagementMapper.exportrevent(documentationBorrowManagement);
    public void exportrevent(HttpServletResponse response, DocumentationReturnManagement documentationReturnManagement) {
        List<ReturnExportDto> documentationReturnManagements = documentationReturnManagementMapper.exportrevent(documentationReturnManagement);
        ExcelUtil<ReturnExportDto> util = new ExcelUtil<>(ReturnExportDto.class);
        util.exportExcel(response, documentationBorrowManagements, "文档借阅-归还记录");
        util.exportExcel(response, documentationReturnManagements, "文档借阅-归还记录");
    }

    @Override
    public List<DocumentationBorrowManagementDto> listAll() {
        return documentationBorrowManagementMapper.list(new LambdaQueryWrapper<DocumentationBorrowManagementDto>().eq(DocumentationBorrowManagementDto::getBorrowStatus, "借阅"));
    }

    @Override