Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-01 2dc478231fd09a88a4d86d44388ae807aca08bc5

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

@@ -8,6 +8,7 @@
import com.sinata.system.domain.MwWarningRecord;
import com.sinata.system.domain.query.MwWarningRecordQuery;
import com.sinata.system.domain.vo.MwWarningRecordVO;
import com.sinata.system.enums.WarningStatusEnum;
import com.sinata.system.mapper.MwWarningRecordMapper;
import com.sinata.system.service.MwWarningRecordService;
import com.sinata.system.service.SysDepartmentService;
@@ -46,6 +47,16 @@
        return PageDTO.of(page);
    }

    /**
     * 解除预警
     *
     * @param id
     */
    @Override
    public void relieve(Long id) {
        lambdaUpdate().set(MwWarningRecord::getStatus, WarningStatusEnum.RESOLVED.getCode()).eq(MwWarningRecord::getId, id).update();
    }

    @Override
    public void export(MwWarningRecordQuery query) throws IOException {
        String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());