From c40ec93373770e0b54c74ffe8ad9c9a16bef236d Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 20 Dec 2024 11:47:55 +0800
Subject: [PATCH] =?UTF-8?q?refactor(project-budget):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A2=84=E7=AE=97=E6=88=90=E6=9C=AC=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E4=B8=B4=E6=97=B6=E8=A1=A8=E5=92=8C=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了 ProjectBudgetCostDetailTemp 类中的 categoryStr 字段
- 简化了 ProjectBudgetService 中的采购类别处理逻辑
- 使用 categoryStr 作为采购类别名称直接赋值给 category 字段
---
 .../model/ProjectBudgetCostDetailTemp.java     |  2 --
 .../work/service/ProjectBudgetService.java     | 18 +-----------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java
index a6bae36..578b0f9 100644
--- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java
+++ b/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java
@@ -14,8 +14,6 @@ import javax.persistence.Transient;
 @Table(name = "project_budget_cost_detail_temp")
 @Data
 public class ProjectBudgetCostDetailTemp extends ProjectBudgetCostDetailBase{
-    @Transient
-    private String categoryStr;
     public ProjectBudgetCostDetail toProjectBudgetCostDetail(){
         ProjectBudgetCostDetail detail = new ProjectBudgetCostDetail();
         detail.setProjectId(getProjectId());
diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
index 4ae3677..9ca1853 100644
--- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
@@ -1283,7 +1283,6 @@ public class ProjectBudgetService {
 //        }
 //        projectBudgetCostDetailRepository.save(CostDetailList);
         final ResponseMsg msg = ResponseMsg.buildSuccessMsg(String.format("成功：%d, 失败：%d", successCount, errorCount));
-        costDetailTempList.forEach(item->item.setCategory(item.getCategoryStr()));
         msg.setData(new HashMap<String,List>(){{put("errorList",errorList);put("successList",costDetailTempList);}});
         return msg;
     }
@@ -1310,22 +1309,7 @@ public class ProjectBudgetService {
         key = "产品大类";
         o1 = m.get(key);
         String category = (String) o1;
-        ProcurementType procurementType = procurementTypeRepository.findByName(category);
-        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 {
-            throw new Exception("该采购类别不存在或者与采购成本项目不匹配");
-        }
+        temp.setCategory(category);
 
         key = "供应商";
         o1 = m.get(key);