项目删除

src/main/java/org/springblade/modules/project/controller/ProjectInfoController.java

@@ -71,12 +71,20 @@ public class ProjectInfoController extends BladeController {
     }
 
     @PostMapping("/update-project-finished")
-    @ApiOperationSupport(order = 5)
+    @ApiOperationSupport(order = 6)
     @Operation(summary = "修改项目完成情况", description = "修改项目完成情况,传入项目信息与计划年份和每年12个月的详情")
     public R<String> updateFinished(@RequestBody ProjectAndPlanDetailDTO dto) {
         projectInfoService.updateFinished(dto);
         return R.success("修改成功");
     }
 
+    @GetMapping("/delete")
+    @ApiOperationSupport(order = 7)
+    @Operation(summary = "项目删除", description = "传入项目id")
+    public R<String> delete(Long id) {
+        projectInfoService.delete(id);
+        return R.success("删除成功");
+    }
+
 
 }

src/main/java/org/springblade/modules/project/service/IProjectInfoService.java

@@ -28,4 +28,6 @@ public interface IProjectInfoService extends BaseService<ProjectInfo> {
     ProjectAndPlanDetailVO detail2(Long id);
 
     void updateFinished(ProjectAndPlanDetailDTO dto);
+
+    void delete(Long id);
 }

src/main/java/org/springblade/modules/project/service/impl/ProjectInfoServiceImpl.java

@@ -316,25 +316,31 @@ public class ProjectInfoServiceImpl extends BaseServiceImpl<ProjectInfoMapper, P
                 }
                 for (ProjectPlanProgressVO progress : vos) {
                     Integer i = progress.getPlanMonth();
+                    progress.setPlanMonthName(monthNames[i]);
+                    progress.setYearlyTarget(planVO.getYearlyTarget());
                     if (i <= 3){
+                        progress.setPlanQuarterName("一季度");
                         if (planVO.getOneInvest() != null) {
                             progress.setPlanInvestMoney(planVO.getOneInvest());
                             progress.setInvestUnfinishedMoney(planVO.getOneInvest().subtract(monthFinished));
                         }
                         progress.setWorkPlan(planVO.getOnePlan());
                     }else if (i <= 6){
+                        progress.setPlanQuarterName("二季度");
                         if (planVO.getTwoInvest() != null) {
                             progress.setPlanInvestMoney(planVO.getTwoInvest());
                             progress.setInvestUnfinishedMoney(planVO.getTwoInvest().subtract(monthFinished));
                         }
                         progress.setWorkPlan(planVO.getTwoPlan());
                     }else if (i <= 9){
+                        progress.setPlanQuarterName("三季度");
                         if (planVO.getThreeInvest() != null) {
                             progress.setPlanInvestMoney(planVO.getThreeInvest());
                             progress.setInvestUnfinishedMoney(planVO.getThreeInvest().subtract(monthFinished));
                         }
                         progress.setWorkPlan(planVO.getThreePlan());
                     }else {
+                        progress.setPlanQuarterName("四季度");
                         if (planVO.getFourInvest() != null) {
                             progress.setPlanInvestMoney(planVO.getFourInvest());
                             progress.setInvestUnfinishedMoney(planVO.getFourInvest().subtract(monthFinished));
@@ -615,4 +621,14 @@ public class ProjectInfoServiceImpl extends BaseServiceImpl<ProjectInfoMapper, P
         //修改年计划
         investPlanService.updateBatchById(updateYearPlan);
     }
+
+    @Override
+    @Transactional
+    public void delete(Long id) {
+        this.removeById(id);
+        investPlanService.remove(new LambdaQueryWrapper<ProjectInvestPlan>()
+                .eq(ProjectInvestPlan::getProjectId,id));
+        planProgressService.remove(new LambdaQueryWrapper<ProjectPlanProgress>()
+                .eq(ProjectPlanProgress::getProjectId,id));
+    }
 }