Merge remote-tracking branch 'origin/master'

xiangpei

2025-02-19 fcdc7109a6ffca4ea1554c875a7011f1071eecb8

Merge remote-tracking branch 'origin/master'

 business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java

@@ -84,7 +84,7 @@
//    @ApiModelProperty("年度投资金额")
//    private BigDecimal yearInvestAmount;
    @ApiModelProperty("年度投资金额")
    private ProjectInfoYearPlanForm yearPlanList;
    private List<ProjectInfoYearPlanForm> yearPlanList;

    @ApiModelProperty("立项时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

 business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java

@@ -88,14 +88,16 @@
    @ApiModelProperty("重点分类  (0省重点项目,  1遂宁市重点项目,  2.射洪市重点项目,  3.一般项目)")
    private String importanceType;

    /** 年度投资计划 */
    @ApiModelProperty("年度投资计划")
    private String year;

//    /** 年度投资计划 */
//    @ApiModelProperty("年度投资计划")
//    private String year;
//
//    /** 年度投资金额 */
//    @ApiModelProperty("年度投资金额")
//    private BigDecimal yearInvestAmount;
    /** 年度投资金额 */
    @ApiModelProperty("年度投资金额")
    private BigDecimal yearInvestAmount;

    private List<ProjectInfoYearPlanVO> yearPlanList;
    /** 立项时间 */
    @ApiModelProperty("立项时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -127,7 +127,7 @@
        //添加项目中标单位
        saveUnit(entity.getId(),form.getWinUnitList());
        //添加年度投资计划
//        saveYearPlan(entity.getId(),form.getYearPlanList());
        saveYearPlan(entity.getId(),form.getYearPlanList());
        return Result.ok("添加成功").data(entity.getId());
    }

@@ -177,21 +177,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());

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

@@ -211,6 +209,7 @@
        List<ProjectInfoYearPlan> projectInfoYearPlans = new ArrayList<>();
        for (ProjectInfoYearPlanForm yearPlanForm : yearPlanList) {
            ProjectInfoYearPlan yearPlan = ProjectInfoYearPlanForm.getEntityByForm(yearPlanForm, null);
            yearPlan.setId(null);
            yearPlan.setProjectInfoId(id);
            projectInfoYearPlans.add(yearPlan);
        }
@@ -363,6 +362,15 @@
            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);
    }