bug修改

mitao

2025-03-28 e7ad42d941410b5ba3ada7220886af0ae0586e5d

bug修改

 medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/MwCollectRecordController.java

@@ -86,7 +86,7 @@
    @ApiOperation("删除")
    @DeleteMapping("/{id}")
    public R<?> remove(@ApiParam(name = "id", value = "医废追溯id", required = true) @PathVariable("id") Long id) {
        collectRecordService.removeById(id);
        collectRecordService.delete(id);
        return R.ok();
    }


 medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java

@@ -19,7 +19,6 @@
import java.io.IOException;
import java.time.LocalDate;
import java.util.List;
import java.util.List;

/**
 * <p>
@@ -123,4 +122,11 @@
     * @return
     */
    DepartmentTagInfoVO getTagInfo(Long id);

    /**
     * 删除医废
     *
     * @param id
     */
    void delete(Long id);
}

 medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.common.entity.PageDTO;
import com.sinata.common.exception.ServiceException;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.config.AutoColumnWidthStrategy;
import com.sinata.system.domain.MedicalWasteStaticsVO;
@@ -18,6 +19,7 @@
import com.sinata.system.domain.vo.MedicalWasteProcessVO;
import com.sinata.system.domain.vo.MwCollectRecordVO;
import com.sinata.system.domain.vo.MwCollectRecordWarningVO;
import com.sinata.system.enums.MedicalWasteStatusEnum;
import com.sinata.system.mapper.MwCollectRecordMapper;
import com.sinata.system.service.MwCollectRecordService;
import com.sinata.system.service.SysDepartmentService;
@@ -216,4 +218,20 @@
    public DepartmentTagInfoVO getTagInfo(Long id) {
        return baseMapper.getTagInfo(id);
    }

    /**
     * 删除医废
     *
     * @param id
     */
    @Override
    public void delete(Long id) {
        MwCollectRecord collectRecord = getById(id);
        if (Objects.nonNull(collectRecord)) {
            if (!collectRecord.getStatus().equals(MedicalWasteStatusEnum.TEMPORARILY_STORED.getCode())) {
                throw new ServiceException("该医废已被转运，不能删除");
            }
            removeById(id);
        }
    }
}