功能改造

heheng

2025-10-15 a4f1e1a9b97f7606347ba1b6a5c5957c3fc28a59

 gkhy-system/src/main/java/com/gkhy/system/service/impl/DailySafetyInspectionServiceImpl.java

@@ -9,7 +9,9 @@
import com.gkhy.common.exception.ServiceException;
import com.gkhy.common.utils.SecurityUtils;
import com.gkhy.system.domain.DailySafetyInspection;
import com.gkhy.system.domain.DailySafetyInspectionDept;
import com.gkhy.system.domain.DailySafetyInspectionUser;
import com.gkhy.system.mapper.DailySafetyInspectionDeptMapper;
import com.gkhy.system.mapper.DailySafetyInspectionMapper;
import com.gkhy.system.mapper.DailySafetyInspectionUserMapper;
import com.gkhy.system.mapper.SysDeptMapper;
@@ -40,6 +42,9 @@
    private DailySafetyInspectionUserMapper dailySafetyInspectionUserMapper;

    @Autowired
    private DailySafetyInspectionDeptMapper dailySafetyInspectionDeptMapper;

    @Autowired
    private SysDeptMapper sysDeptMapper;

    @Override
@@ -54,14 +59,14 @@
//        if (ObjectUtil.isEmpty(dailySafetyInspectionUsers)) {
//            throw new ServiceException("参检人员不能为空");
//        }
        Long researchGroup = inspection.getResearchGroup();
        SysDept sysDept = sysDeptMapper.selectDeptById(researchGroup);
        if (sysDept == null) {
            throw new ServiceException("部门不存在");
        }
        if (!"1".equals(sysDept.getSafety())){
            throw new ServiceException("所选部门未开启安全检查");
        }
//        Long researchGroup = inspection.getResearchGroup();
//        SysDept sysDept = sysDeptMapper.selectDeptById(researchGroup);
//        if (sysDept == null) {
//            throw new ServiceException("部门不存在");
//        }
//        if (!"1".equals(sysDept.getSafety())){
//            throw new ServiceException("所选部门未开启安全检查");
//        }

        int i = 0;
        if (inspection.getId() == null) {
@@ -72,6 +77,9 @@
            inspection.setUpdateTime(LocalDateTime.now());
            inspection.setUpdateBy(SecurityUtils.getUsername());
            i = dailySafetyInspectionMapper.updateById(inspection);
        }
        if (i > 0){
            saveDailySafetyInspectionDept(inspection.getDailySafetyInspectionDepts(),inspection.getId());
        }
//        if (i > 0) {
//            saveDailySafetyInspectionUser(dailySafetyInspectionUsers, inspection.getId());
@@ -90,7 +98,17 @@
        });

    }
    private void saveDailySafetyInspectionDept(List<DailySafetyInspectionDept> dailySafetyInspectionDepts, Long id) {

        DailySafetyInspectionDept dept = new DailySafetyInspectionDept();
        dept.setDailySafetyInspectionId(id);
        dailySafetyInspectionDeptMapper.deleteById(dept);
        dailySafetyInspectionDepts.forEach(dept1 -> {
            dept1.setDailySafetyInspectionId(id);
            dailySafetyInspectionDeptMapper.insert(dept1);
        });

    }

    @Override
    public int deleteDailySafetyInspection(Long id) {