From dbbd3922f9a759e46349e220d0c8c0beece1f570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=BD=AC?=
 <14779346+xswl_123@user.noreply.gitee.com>
Date: Wed, 6 Aug 2025 14:30:30 +0800
Subject: [PATCH] =?UTF-8?q?8-6=20=E5=8F=96=E6=B6=88=E9=A2=84=E7=AE=97?=
 =?UTF-8?q?=E5=8D=95=E5=90=8C=E6=AD=A5=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E4=BD=BF=E7=94=A8=E8=AE=B0=E5=BD=95=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E6=92=A4=E5=9B=9E=E9=A2=84=E7=AE=97=E6=B6=88=E8=B4=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=88=9B=E5=BB=BA=E9=A1=B9=E7=9B=AE=E6=97=B6=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=AE=A1=E7=AE=97=E6=80=BB=E9=A2=84=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dite/znpt/converts/Impl/ConvertsImpl.java |  7 ++++-
 .../com/dite/znpt/domain/vo/ProjectReq.java   | 15 ++++++++++
 .../service/ProjectBudgetInfoService.java     |  2 ++
 .../impl/ProjectBudgetInfoServiceImpl.java    | 28 +++++++++++++++++++
 .../ProjectBudgetInfoController.java          |  7 +++++
 5 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/dite/znpt/converts/Impl/ConvertsImpl.java b/core/src/main/java/com/dite/znpt/converts/Impl/ConvertsImpl.java
index 534741a..842511e 100644
--- a/core/src/main/java/com/dite/znpt/converts/Impl/ConvertsImpl.java
+++ b/core/src/main/java/com/dite/znpt/converts/Impl/ConvertsImpl.java
@@ -275,7 +275,12 @@ public class ConvertsImpl implements Converts {
         projectEntity.setEndDate( req.getEndDate() );
         projectEntity.setProjectOrigin( req.getProjectOrigin() );
         projectEntity.setProjectBudget( req.getProjectBudget() );
-
+        double budget = req.getLaborCost()
+                + req.getBonusProvision()
+                + req.getTransAccomMeals()
+                + req.getOthersCost()
+                + req.getEquipmentAmortization();
+        projectEntity.setProjectBudget((int) budget);
         return projectEntity;
     }
 
diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java
index fdd2304..2246c57 100644
--- a/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java
+++ b/core/src/main/java/com/dite/znpt/domain/vo/ProjectReq.java
@@ -113,4 +113,19 @@ public class ProjectReq implements Serializable {
 
     @ApiModelProperty(value = "结束时间")
     private LocalDate endDate;
+
+    @ApiModelProperty("人工成本")
+    private Double laborCost;
+
+    @ApiModelProperty("设备摊销")
+    private Double equipmentAmortization;
+
+    @ApiModelProperty("奖金预提")
+    private Double bonusProvision;
+
+    @ApiModelProperty("交通食宿")
+    private Double transAccomMeals;
+
+    @ApiModelProperty("其他杂费")
+    private Double othersCost;
 }
diff --git a/core/src/main/java/com/dite/znpt/service/ProjectBudgetInfoService.java b/core/src/main/java/com/dite/znpt/service/ProjectBudgetInfoService.java
index 05e719a..fa32837 100644
--- a/core/src/main/java/com/dite/znpt/service/ProjectBudgetInfoService.java
+++ b/core/src/main/java/com/dite/znpt/service/ProjectBudgetInfoService.java
@@ -22,5 +22,7 @@ public interface ProjectBudgetInfoService extends IService<ProjectBudgetInfoEnti
     void saveData(ProjectBudgetInfoImportReq req, MultipartFile[] files);
 
     ProjectBudgetInfoDetailResp detailByProjectId(String projectId);
+
+    void delete(String budgetId);
 }
 
diff --git a/core/src/main/java/com/dite/znpt/service/impl/ProjectBudgetInfoServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ProjectBudgetInfoServiceImpl.java
index 4ceb0d9..c78c4a0 100644
--- a/core/src/main/java/com/dite/znpt/service/impl/ProjectBudgetInfoServiceImpl.java
+++ b/core/src/main/java/com/dite/znpt/service/impl/ProjectBudgetInfoServiceImpl.java
@@ -92,4 +92,32 @@ public class ProjectBudgetInfoServiceImpl extends ServiceImpl<ProjectBudgetInfoM
         resp.setRestBudget(resp.getProjectBudget() - resp.getUseLaborCost() - resp.getUseEquipmentAmortization() - resp.getUseBonusProvision() - resp.getUseTransAccomMeals() - resp.getUseOthersCost());
         return resp;
     }
+
+    @Override
+    public void delete(String budgetId) {
+        ProjectBudgetInfoEntity entity = this.baseMapper.selectById(budgetId);
+        ProjectEntity projectEntity = projectService.getById(entity.getProjectId());
+        switch (entity.getBudgetName()) {
+            case "人工成本":
+                projectEntity.setUseLaborCost(projectEntity.getUseLaborCost() - entity.getBudgetAmount());
+                break;
+            case "设备摊销":
+                projectEntity.setUseEquipmentAmortization(projectEntity.getUseEquipmentAmortization() - entity.getBudgetAmount());
+                break;
+            case "奖金预提":
+                projectEntity.setUseBonusProvision(projectEntity.getUseBonusProvision() - entity.getBudgetAmount());
+                break;
+            case "交通食宿":
+                projectEntity.setUseTransAccomMeals(projectEntity.getUseTransAccomMeals() - entity.getBudgetAmount());
+                break;
+            case "其他杂费":
+                projectEntity.setUseOthersCost(projectEntity.getUseOthersCost() - entity.getBudgetAmount());
+                break;
+            default:
+                break;
+        }
+        projectService.updateById(projectEntity);
+        this.baseMapper.deleteById(budgetId);
+        //  删除附件
+    }
 }
diff --git a/web/src/main/java/com/dite/znpt/web/controller/ProjectBudgetInfoController.java b/web/src/main/java/com/dite/znpt/web/controller/ProjectBudgetInfoController.java
index 98f5999..7c02b18 100644
--- a/web/src/main/java/com/dite/znpt/web/controller/ProjectBudgetInfoController.java
+++ b/web/src/main/java/com/dite/znpt/web/controller/ProjectBudgetInfoController.java
@@ -47,5 +47,12 @@ public class ProjectBudgetInfoController {
     public Result<ProjectBudgetInfoDetailResp> detail(@PathVariable String projectId) {
         return Result.ok(projectBudgetInfoService.detailByProjectId(projectId));
     }
+
+    @ApiOperation(value = "删除项目预算信息", httpMethod = "DELETE")
+    @DeleteMapping("/{budgetId}")
+    public Result<Void> delete(@PathVariable String budgetId) {
+        projectBudgetInfoService.delete(budgetId);
+        return Result.ok();
+    }
 }