fuliqi
2025-02-19 178b4ee9f38a8b38b1cb5321fee25a6038b39df9
中标单位id设为null
2个文件已修改
32 ■■■■■ 已修改文件
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
@@ -84,7 +84,7 @@
//    @ApiModelProperty("年度投资金额")
//    private BigDecimal yearInvestAmount;
    @ApiModelProperty("年度投资金额")
    private BigDecimal yearPlanList;
    private ProjectInfoYearPlanForm yearPlanList;
    @ApiModelProperty("立项时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
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;
@@ -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();
@@ -179,6 +184,14 @@
        //添加项目中标单位
        saveUnit(entity.getId(),projectInfoWinUnitForm);
        //修改年度投资计划
        //删除原数据
//        List<ProjectInfoYearPlanForm> projectInfoYearPlanForm = form.getYearPlanList();
        QueryWrapper<ProjectInfoYearPlan> yearPlanWrapper = new QueryWrapper<>();
        unitWrapper.eq("project_info_id",form.getId());
        projectInfoWinUnitService.remove(unitWrapper);
        //添加年度投资计划
        saveUnit(entity.getId(),projectInfoWinUnitForm);
        return Result.ok("修改成功");
    }
@@ -186,6 +199,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 +207,17 @@
            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.setProjectInfoId(id);
            projectInfoYearPlans.add(yearPlan);
        }
        if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
            projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
        }
    }
    /**
     * 批量删除
     *
@@ -220,6 +244,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,6 +359,7 @@
        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);