From b7790d36fba2387ecca522fd3b2e3ae2d16ff20f Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 20 Dec 2024 11:24:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(ProjectBudgetService):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=87=87=E8=B4=AD=E7=B1=BB=E5=9E=8B=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 增加了对采购类型不存在的情况的处理
- 当采购类型不存在时，自动创建新的采购类型
- 优化了采购类型匹配条件，去除了不必要的类型判断
---
 .../cn/palmte/work/service/ProjectBudgetService.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
index 0258f22..4ae3677 100644
--- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
@@ -4,6 +4,7 @@ import cn.palmte.work.bean.*;
 import cn.palmte.work.config.activiti.ActProcessKeyEnum;
 import cn.palmte.work.model.*;
 import cn.palmte.work.utils.DateKit;
+import cn.palmte.work.utils.InterfaceUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -1310,7 +1311,16 @@ public class ProjectBudgetService {
         o1 = m.get(key);
         String category = (String) o1;
         ProcurementType procurementType = procurementTypeRepository.findByName(category);
-        if (procurementType != null && (procurementType.getType() == temp.getType() && temp.getType()!=4)) {
+        if (procurementType==null){
+            procurementType=new ProcurementType();
+            procurementType.setName(category);
+            procurementType.setType(temp.getType());
+            procurementType.setEnabled(1);
+            procurementType.setCreatedBy(InterfaceUtil.getAdmin().getRealName());
+            procurementType.setCreatedTime(new Date());
+            procurementTypeRepository.saveAndFlush(procurementType);
+        }
+        if (procurementType != null && procurementType.getType() == temp.getType()) {
             temp.setCategory(procurementType.getId().toString());
             temp.setCategoryStr(category);
         } else {