调整业务逻辑

heheng

2025-03-24 91921823fb85dbd1ee236020c7b81f6bdf6d7edb

 expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java

@@ -140,13 +140,9 @@
//            throw new ServiceException("固定专家不能为空！");
//        }

        if ((projectManagement1.getStep() == 1 || projectManagement1.getStep() == 2) && (projectManagement.getStep() == 2 ) ){
        if ((projectManagement1.getStep() == 1 || projectManagement1.getStep() == 2) && (projectManagement.getStep() == 2  ) ){
            projectManagementSave.setStep(2L);
            projectManagementSave.setState(1L);
        }else if (projectManagement1.getStep() == 2 && projectManagement.getStep() == 3){
            projectManagementSave.setStep(2L);
            projectManagementSave.setState(2L);
            projectManagementSave.setProjectCheckTime(new Date());
            List<ProjectExpertSaveReqDto> collect = saveData.stream()
                    .filter(dto -> "1".equals(dto.getTeamLeader().toString()))
                    .collect(Collectors.toList());
@@ -159,6 +155,11 @@
            }
            projectManagementSave.setExpertName(collect.get(0).getExpertName());
            projectManagementSave.setExpertId(collect.get(0).getExpertId());
        }else if (projectManagement1.getStep() == 2 && projectManagement.getStep() == 3){
            projectManagementSave.setStep(2L);
            projectManagementSave.setState(2L);
            projectManagementSave.setProjectCheckTime(new Date());

        }

        List<ProjectExpertSaveReqDto> saveList = saveData.stream()
@@ -286,12 +287,16 @@
        if (req.getState() == 3){
            projectManagementUp.setStep(3L);
        }else if (req.getState() == 1){
            projectManagementUp.setStep(2L);
            projectManagementUp.setExpertName("");
            projectManagementUp.setExpertId(0l);
            projectManagementUp.setExpertNum(0L);
            projectManagementUp.setStep(1L);
        }
        int i = projectManagementMapper.updateProjectManagement(projectManagementUp);
        //驳回删
        if (req.getState() == 1){
            projectFileMapper.deleteProjectFileByIdAndType(req.getId(), "1");
            projectExpertMapper.deleteProjectExpertByProjectId(req.getId());
        }
        if (i > 0 && StringUtils.isNotEmpty(projectFile) && req.getState() == 3){
            //删除之前的该类型