项目编辑bug

xiangpei

2025-02-24 ba2482dddc5df9f31fe9aef8543bef8453a22f88

项目编辑bug

 business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java

@@ -817,7 +817,7 @@
                entity.setCreateBy(userId);
                entity.setUpdateBy(userId);
                //如果是储备项目(未开工项目)不需要审核
                if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
                if ("0".equals(entity.getProjectPhase())) {
                    entity.setUsedStatus(ProjectConstant.PASS);
                }
                // 管理员修改的直接通过
@@ -828,6 +828,7 @@
                    throw new RuntimeException("项目重复，项目名称、项目码已存在");
                }
                baseMapper.insert(entity);
                projectId = entity.getId();
                addPlan(entity.getId()); //添加计划表
                //添加项目中标单位
                List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
@@ -850,26 +851,6 @@
                }
                if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
                    projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
                }
                // 新增
                if (Objects.nonNull(form.getProjectInvestmentInfoForm())) {
                    form.getProjectInvestmentInfoForm().setProjectId(projectId);
                    projectInvestmentInfoServiceImpl.add(form.getProjectInvestmentInfoForm());
                }

                if (Objects.nonNull(form.getProjectInvestmentFundingForm())) {
                    form.getProjectInvestmentFundingForm().setProjectId(projectId);
                    projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm());
                }

                if (Objects.nonNull(form.getProjectInvestmentPolicyComplianceForm())) {
                    form.getProjectInvestmentPolicyComplianceForm().setProjectId(projectId);
                    projectInvestmentPolicyComplianceServiceImpl.add(form.getProjectInvestmentPolicyComplianceForm());
                }

                if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm())) {
                    form.getProjectUnitRegistrationInfoForm().setProjectId(projectId);
                    projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
                }
            } else {
                //更新
@@ -926,19 +907,25 @@
                if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
                    projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
                }
                // 更新
                if (Objects.nonNull(form.getProjectInvestmentInfoForm())) {
                    projectInvestmentInfoServiceImpl.update(form.getProjectInvestmentInfoForm());
            }

            // 更新其它项目信息表
            if (Objects.nonNull(form.getProjectInvestmentFundingForm())) {
                if (Objects.nonNull(form.getProjectInvestmentFundingForm().getId())) {
                    projectInvestmentFundingServiceImpl.update(form.getProjectInvestmentFundingForm());
                } else {
                    form.getProjectInvestmentFundingForm().setProjectId(projectId);
                    projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm());
                }
                if (Objects.nonNull(form.getProjectInvestmentFundingForm())) {
                    projectInvestmentFundingServiceImpl.update();
                }
                if (Objects.nonNull(form.getProjectInvestmentPolicyComplianceForm())) {
                    projectInvestmentPolicyComplianceServiceImpl.update(form.getProjectInvestmentPolicyComplianceForm());
                }
                if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm())) {
            }
            if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm())) {
                if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm().getId())) {
                    projectUnitRegistrationInfoServiceImpl.update(form.getProjectUnitRegistrationInfoForm());
                } else {
                    form.getProjectUnitRegistrationInfoForm().setProjectId(projectId);
                    projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
                }

            }
        }
        return Result.ok("保存成功");

 business/src/main/java/com/ycl/service/impl/ProjectInvestmentFundingServiceImpl.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.ProjectInvestmentFunding;
import com.ycl.domain.entity.ProjectInvestmentInfo;
@@ -109,9 +110,9 @@
     */
    @Override
    public Result detail(Integer id) {
        QueryWrapper<ProjectInvestmentFunding> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("project_id",id);
        ProjectInvestmentFunding entity = baseMapper.selectOne(queryWrapper);
        ProjectInvestmentFunding entity = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(ProjectInvestmentFunding::getProjectId, id)
                .one();
        ProjectInvestmentFundingVO vo =new ProjectInvestmentFundingVO();
        if(entity!=null){
            vo = ProjectInvestmentFundingVO.getVoByEntity(entity, null);

 business/src/main/java/com/ycl/service/impl/ProjectUnitRegistrationInfoServiceImpl.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.ProjectInvestmentInfo;
import com.ycl.domain.entity.ProjectUnitRegistrationInfo;
@@ -116,9 +117,9 @@
     */
    @Override
    public Result detail(Integer id) {
        QueryWrapper<ProjectUnitRegistrationInfo> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("project_id", id);
        ProjectUnitRegistrationInfo entity = baseMapper.selectOne(queryWrapper);
        ProjectUnitRegistrationInfo entity = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(ProjectUnitRegistrationInfo::getProjectId, id)
                .one();
        ProjectUnitRegistrationInfoVO vo = new ProjectUnitRegistrationInfoVO();
        if (entity != null) {
            vo = ProjectUnitRegistrationInfoVO.getVoByEntity(entity, null);