From c4ab6a24d2825f11a0de0f165667dc533c458a01 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 10:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/ProjectInfoController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectInfoController.java b/business/src/main/java/com/ycl/controller/ProjectInfoController.java
index 33bd028..9d8b913 100644
--- a/business/src/main/java/com/ycl/controller/ProjectInfoController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectInfoController.java
@@ -33,6 +33,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.function.Consumer;
/**
@@ -62,9 +63,17 @@
projectInfo.setYearInvestAmount(project.getTzje());
// 澶勭悊涓氫富鍗曚綅銆佷富绠￠儴闂╥d
Long yzId = deptMapper.selectByName(project.getProjectOwnerUnit());
- projectInfo.setProjectOwnerUnit(yzId);
+ if (Objects.nonNull(yzId)) {
+ projectInfo.setProjectOwnerUnit(yzId);
+ }
Long zgId = deptMapper.selectByName(project.getCompetentDepartment());
- projectInfo.setCompetentDepartment(zgId + "");
+ if (Objects.nonNull(zgId)) {
+ projectInfo.setCompetentDepartment(zgId + "");
+ }
+ projectInfo.setArea(project.getArea());
+ projectInfo.setYear("2025");
+ // 璁剧疆涓哄鏍稿凡閫氳繃
+ projectInfo.setUsedStatus(2);
projectInfoService.save(projectInfo);
}
};
--
Gitblit v1.8.0