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 detail(@PathVariable String projectId) { return Result.ok(projectBudgetInfoService.detailByProjectId(projectId)); } + + @ApiOperation(value = "删除项目预算信息", httpMethod = "DELETE") + @DeleteMapping("/{budgetId}") + public Result delete(@PathVariable String budgetId) { + projectBudgetInfoService.delete(budgetId); + return Result.ok(); + } }