From 915231760112c9b1b31885550e30d95d1c76f859 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 19 二月 2025 11:23:03 +0800
Subject: [PATCH] 流程推进列表分页bug
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
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 dba1856..2dba310 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/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);
--
Gitblit v1.8.0