From 5f5e0dcabebd5d853eecdef709c860528d40af8b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 19 二月 2025 11:19:40 +0800
Subject: [PATCH] 年度投资金额改成多条
---
business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java | 2 +-
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 20 ++++++++++++++------
business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java | 14 ++++++++------
3 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java b/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
index 17c6a4b..a55ea2f 100644
--- a/business/src/main/java/com/ycl/domain/form/ProjectInfoForm.java
+++ b/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")
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
index b075f69..7461909 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectInfoVO.java
+++ b/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")
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index 2dba310..92b9efc 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/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);
}
--
Gitblit v1.8.0