已领用的危险源台账删除时，做提示限制

zss

11 小时以前 b072235a80863d6b8cb14b4b6d58815069609a82

已领用的危险源台账删除时，做提示限制

 src/main/java/com/ruoyi/safe/controller/SafeHazardController.java

@@ -50,7 +50,7 @@
    @ApiOperation("删除危险源台账")
    @DeleteMapping("/{ids}")
    public R delSafeHazard(@RequestBody List<Integer> ids) {
        return R.ok(safeHazardService.removeBatchByIds(ids));
        return R.ok(safeHazardService.delSafeHazard(ids));
    }

}

 src/main/java/com/ruoyi/safe/service/SafeHazardService.java

@@ -5,6 +5,8 @@
import com.ruoyi.safe.pojo.SafeHazard;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
 * 安全生产--危险源台账 服务类
@@ -16,4 +18,6 @@
public interface SafeHazardService extends IService<SafeHazard> {

    IPage<SafeHazard> pageSafeHazard(Page page, SafeHazard safeHazard);

    int delSafeHazard(List<Integer> ids);
}

 src/main/java/com/ruoyi/safe/service/impl/SafeHazardServiceImpl.java

@@ -1,13 +1,18 @@
package com.ruoyi.safe.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.safe.mapper.SafeHazardRecordMapper;
import com.ruoyi.safe.pojo.SafeHazard;
import com.ruoyi.safe.mapper.SafeHazardMapper;
import com.ruoyi.safe.pojo.SafeHazardRecord;
import com.ruoyi.safe.service.SafeHazardService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -23,8 +28,24 @@
    @Autowired
    private SafeHazardMapper safeHazardMapper;

    @Autowired
    private SafeHazardRecordMapper safeHazardRecordMapper;

    @Override
    public IPage<SafeHazard> pageSafeHazard(Page page, SafeHazard safeHazard) {
        return safeHazardMapper.pageSafeHazard(page, safeHazard);
    }

    @Override
    public int delSafeHazard(List<Integer> ids) {
        //判断是否有正在领用的危险源
        List<SafeHazardRecord> safeHazardRecords = safeHazardRecordMapper.selectList(Wrappers.<SafeHazardRecord>lambdaQuery()
                .in(SafeHazardRecord::getSafeHazardId, ids)
                .isNull(SafeHazardRecord::getReturnUserId));
        if (safeHazardRecords.size()>0){
            throw new RuntimeException("该危险源已经领用,无法删除,等归还之后再进行删除!");
        }
        safeHazardMapper.deleteBatchIds(ids);
        return 0;
    }
}