From f011584e57af9f0f28ed06fd19e7bfa4d4e7ebeb Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 20 Dec 2024 11:00:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(project-budget):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E8=AF=A6=E6=83=85=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为 ProjectBudgetCostDetailTemp 类添加 Lombok 的 @Data 注解，简化代码
- 新增 categoryStr 字段用于存储采购类别字符串
- 修改 ProjectBudgetService 中的成本详情保存逻辑，更新类别信息
- 修复类型判断逻辑，将"施工"改为"工程"
---
 .../cn/palmte/work/model/ProjectBudgetCostDetailTemp.java     | 4 ++++
 .../java/cn/palmte/work/service/ProjectBudgetService.java     | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java
index 60f916d..0057b53 100644
--- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java
+++ b/src/main/java/cn/palmte/work/model/ProjectBudgetCostDetailTemp.java
@@ -1,6 +1,8 @@
 package cn.palmte.work.model;
 
 
+import lombok.Data;
+
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -9,7 +11,9 @@ import javax.persistence.Table;
  */
 @Entity
 @Table(name = "project_budget_cost_detail_temp")
+@Data
 public class ProjectBudgetCostDetailTemp extends ProjectBudgetCostDetailBase{
+    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 609b5ad..0258f22 100644
--- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
@@ -1282,6 +1282,7 @@ 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;
     }
@@ -1296,7 +1297,7 @@ public class ProjectBudgetService {
         String type = (String) o1;
         if ("设备".equals(type)) {
             temp.setType(1);
-        } else if ("施工".equals(type)) {
+        } else if ("工程".equals(type)) {
             temp.setType(2);
         } else if ("服务".equals(type)) {
             temp.setType(3);
@@ -1311,6 +1312,7 @@ public class ProjectBudgetService {
         ProcurementType procurementType = procurementTypeRepository.findByName(category);
         if (procurementType != null && (procurementType.getType() == temp.getType() && temp.getType()!=4)) {
             temp.setCategory(procurementType.getId().toString());
+            temp.setCategoryStr(category);
         } else {
             throw new Exception("该采购类别不存在或者与采购成本项目不匹配");
         }