任务回显bug

xiangpei

2025-02-20 c9128daf5216f13246ad5c5a8976fe04cbe7568d

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

@@ -42,6 +42,7 @@
import com.ycl.service.FileService;
import com.ycl.service.ProjectInfoService;
import com.ycl.service.ProjectInfoWinUnitService;
import com.ycl.service.ProjectInfoYearPlanService;
import com.ycl.system.mapper.SysDeptMapper;
import lombok.RequiredArgsConstructor;
import org.apache.commons.codec.Charsets;
@@ -79,6 +80,7 @@

    private final ProjectInfoMapper projectInfoMapper;
    private final ProjectInfoWinUnitService projectInfoWinUnitService;
    private final ProjectInfoYearPlanService projectInfoYearPlanService;
    private final ProjectInvestmentFundingMapper investmentFundingMapper;
    private final ProjectInvestmentInfoMapper investmentInfoMapper;
    private final ProjectInvestmentPolicyComplianceMapper policyMapper;
@@ -108,7 +110,7 @@
        entity.setProjectOwnerUnit(deptId);
        entity.setCreateBy(userId);
        entity.setUpdateBy(userId);
        //如果不是储备项目(不是未开工项目)不需要审核
        //如果是储备项目(未开工项目)不需要审核
        if(ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())){
            entity.setUsedStatus(ProjectConstant.PASS);
        }
@@ -124,9 +126,12 @@

        //添加项目中标单位
        saveUnit(entity.getId(),form.getWinUnitList());

        //添加年度投资计划
        saveYearPlan(entity.getId(),form.getYearPlanList());
        return Result.ok("添加成功").data(entity.getId());
    }



    public void addPlan(Long projectInfoId) {
        Plan plan = new Plan();
@@ -154,6 +159,10 @@
        ProjectInfoForm.getEntityByForm(form, entity);
        Long userId = SecurityUtils.getUserId();
        entity.setUpdateBy(userId);
        //如果是储备项目(未开工项目)不需要审核
        if(ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())){
            entity.setUsedStatus(ProjectConstant.PASS);
        }
        //更新项目信息
        baseMapper.updateById(entity);
        List<File> fileList = form.getFileList();
@@ -172,13 +181,19 @@

        //修改项目中标单位
        //删除原数据
        List<ProjectInfoWinUnitForm> projectInfoWinUnitForm = form.getWinUnitList();
        QueryWrapper<ProjectInfoWinUnit> unitWrapper = new QueryWrapper<>();
        unitWrapper.eq("project_info_id",form.getId());
        projectInfoWinUnitService.remove(unitWrapper);
        //添加项目中标单位
        saveUnit(entity.getId(),projectInfoWinUnitForm);
        saveUnit(entity.getId(),form.getWinUnitList());

        //修改年度投资计划
        //删除原数据
        QueryWrapper<ProjectInfoYearPlan> yearPlanWrapper = new QueryWrapper<>();
        unitWrapper.eq("project_info_id",form.getId());
        projectInfoYearPlanService.remove(yearPlanWrapper);
        //添加年度投资计划
        saveYearPlan(entity.getId(),form.getYearPlanList());
        return Result.ok("修改成功");
    }

@@ -186,6 +201,7 @@
        List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
        for (ProjectInfoWinUnitForm winUnitForm : projectInfoWinUnitForm) {
            ProjectInfoWinUnit projectInfoWinUnit = ProjectInfoWinUnitForm.getEntityByForm(winUnitForm, null);
            projectInfoWinUnit.setId(null);
            projectInfoWinUnit.setProjectInfoId(id);
            projectInfoWinUnits.add(projectInfoWinUnit);
        }
@@ -193,7 +209,18 @@
            projectInfoWinUnitService.saveBatch(projectInfoWinUnits);
        }
    }

    private void saveYearPlan(Long id, List<ProjectInfoYearPlanForm> yearPlanList) {
        List<ProjectInfoYearPlan> projectInfoYearPlans = new ArrayList<>();
        for (ProjectInfoYearPlanForm yearPlanForm : yearPlanList) {
            ProjectInfoYearPlan yearPlan = ProjectInfoYearPlanForm.getEntityByForm(yearPlanForm, null);
            yearPlan.setId(null);
            yearPlan.setProjectInfoId(id);
            projectInfoYearPlans.add(yearPlan);
        }
        if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
            projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
        }
    }
    /**
     * 批量删除
     *
@@ -220,6 +247,7 @@
        policyMapper.delete(new QueryWrapper<ProjectInvestmentPolicyCompliance>().eq("project_id", id));
        unitRegistrationInfoMapper.delete(new QueryWrapper<ProjectUnitRegistrationInfo>().eq("project_id", id));
        projectInfoWinUnitService.remove(new QueryWrapper<ProjectInfoWinUnit>().eq("project_info_id",id));
        projectInfoYearPlanService.remove(new QueryWrapper<ProjectInfoYearPlan>().eq("project_info_id",id));

        List<String> types = new ArrayList<>();
        types.add(FileTypeEnum.PROJECT_INFO.getType());
@@ -334,9 +362,19 @@
        List<ProjectInfoWinUnit> unitList = projectInfoWinUnitService.list(new QueryWrapper<ProjectInfoWinUnit>().eq("project_info_id", id));
        for (ProjectInfoWinUnit projectInfoWinUnit : unitList) {
            ProjectInfoWinUnitVO unitVO = ProjectInfoWinUnitVO.getVoByEntity(projectInfoWinUnit,null);
            unitVO.setId(null);
            unitVOS.add(unitVO);
        }
        vo.setWinUnitList(unitVOS);
        //年度投资计划
        List<ProjectInfoYearPlanVO> yearPlanVOS = new ArrayList<>();
        List<ProjectInfoYearPlan> yearPlaList = projectInfoYearPlanService.list(new QueryWrapper<ProjectInfoYearPlan>().eq("project_info_id", id));
        for (ProjectInfoYearPlan yearPlan : yearPlaList) {
            ProjectInfoYearPlanVO yearPlanVO = ProjectInfoYearPlanVO.getVoByEntity(yearPlan,null);
            yearPlanVO.setId(null);
            yearPlanVOS.add(yearPlanVO);
        }
        vo.setYearPlanList(yearPlanVOS);
        return Result.ok().data(vo);
    }