新增暂存及图片功能

heheng

4 days ago f038e7d0338375025baa96986c5f1990abd990b9

 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;
@@ -19,6 +21,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;

/**
@@ -40,10 +43,21 @@
    private DailySafetyInspectionUserMapper dailySafetyInspectionUserMapper;

    @Autowired
    private DailySafetyInspectionDeptMapper dailySafetyInspectionDeptMapper;

    @Autowired
    private SysDeptMapper sysDeptMapper;

    @Override
    public List<DailySafetyInspection> selectDailySafetyInspectionList(DailySafetyInspection inspection) {
        boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
        if (!admin){
            boolean sysAdmin = SecurityUtils.hasRole(Constants.SYS_ADMIN);
            boolean placeSafetyOfficer = SecurityUtils.hasRole(Constants.PLACE_SAFETY_OFFICER);
            if (!(sysAdmin || placeSafetyOfficer)) {
                inspection.setCreateById(SecurityUtils.getUserId());
            }
        }
        return dailySafetyInspectionMapper.getDailySafetyInspectionList(inspection);
    }

@@ -54,24 +68,30 @@
//        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) {
            inspection.setCreateTime(LocalDateTime.now());
            inspection.setCreateBy(SecurityUtils.getUsername());
            inspection.setCreateById(SecurityUtils.getUserId());
            i = dailySafetyInspectionMapper.insert(inspection);
        } else {
            inspection.setUpdateTime(LocalDateTime.now());
            inspection.setUpdateBy(SecurityUtils.getUsername());
            inspection.setUpdateById(SecurityUtils.getUserId());
            i = dailySafetyInspectionMapper.updateById(inspection);
        }
        if (i > 0 && ObjectUtil.isNotEmpty(inspection.getDailySafetyInspectionDepts())){
            saveDailySafetyInspectionDept(inspection.getDailySafetyInspectionDepts(),inspection.getId());
        }
//        if (i > 0) {
//            saveDailySafetyInspectionUser(dailySafetyInspectionUsers, inspection.getId());
@@ -90,27 +110,73 @@
        });

    }
    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) {
        return dailySafetyInspectionMapper.update(new DailySafetyInspection(),
                new LambdaUpdateWrapper<DailySafetyInspection>().eq(DailySafetyInspection::getId, id)
                        .set(DailySafetyInspection::getDelFlag, Constants.FAIL).set(DailySafetyInspection::getUpdateTime, LocalDateTime.now())
                        .set(DailySafetyInspection::getUpdateBy, SecurityUtils.getUsername()));
                        .set(DailySafetyInspection::getUpdateBy, SecurityUtils.getUsername()).set(DailySafetyInspection::getUpdateById, SecurityUtils.getUserId()));
    }

    @Override
    public int getCheckCount() {
        Long deptId = SecurityUtils.getDeptId();
        SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
        if (sysDept == null){
        Long[] deptIds = SecurityUtils.getDeptIds();
        if (ObjectUtil.isEmpty(deptIds)){
            return 1;
        }else {
            if (!"1".equals(sysDept.getSafety())){
                return 1;
        }
        List<SysDept> sysDepts = sysDeptMapper.selectDeptByIds(deptIds);
        if (ObjectUtil.isEmpty(sysDepts)){
            return 1;
        }
        List<Long> data = new ArrayList<>();
        for (SysDept sysDept : sysDepts) {
            if ("1".equals(sysDept.getSafety())){
                data.add(sysDept.getDeptId());
            }
        }
        return dailySafetyInspectionMapper.getCheckCount(deptId);
        if (ObjectUtil.isEmpty(data)){
            return 1;
        }
        return dailySafetyInspectionMapper.getCheckCountList(data);

//        Long deptId = SecurityUtils.getDeptId();
//        SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
//        if (sysDept == null){
//            return 1;
//        }else {
//            if (!"1".equals(sysDept.getSafety())){
//                return 1;
//            }
//        }
       // return dailySafetyInspectionMapper.getCheckCount(deptId);
    }


    private void checkPer(){
        boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
        if (!admin){
            boolean sysAdmin = SecurityUtils.hasRole(Constants.SYS_ADMIN);
            if (!sysAdmin){
                throw new ServiceException("没有权限");
            }
            boolean placeSafetyOfficer = SecurityUtils.hasRole(Constants.PLACE_SAFETY_OFFICER);
            if (!placeSafetyOfficer){
                throw new ServiceException("没有权限");
            }

        }

    }
}