1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/PlanController.java

@@ -158,14 +158,7 @@ public class PlanController {
 
     @RequestMapping("/deletePlan")
     public HttpRespMsg deletePlan(Integer id){
-        HttpRespMsg msg=new HttpRespMsg();
-        Report one = reportService.getOne(new LambdaQueryWrapper<Report>().eq(id!=null,Report::getPlanId, id).last("LIMIT 1"));
-        if(one==null){
-            planService.removeById(id);
-            return msg;
-        }
-        msg.setError("‘已有员工报工，删除失败");
-        return msg;
+        return planService.deletePlan(id);
     }
 }
 

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/PlanService.java

@@ -54,4 +54,6 @@ public interface PlanService extends IService<Plan> {
     HttpRespMsg stopPlan(Integer id);
 
     HttpRespMsg allPlanList(HttpServletRequest request);
+
+    HttpRespMsg deletePlan(Integer id);
 }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanServiceImpl.java

@@ -97,6 +97,8 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
     private ReportMapper reportMapper;
     @Resource
     private SysFunctionService sysFunctionService;
+    @Resource
+    private ReportService reportService;
 
     @Value(value = "${upload.path}")
     private String path;
@@ -1318,4 +1320,25 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         msg.setData(plans);
         return msg;
     }
+
+    @Override
+    public HttpRespMsg deletePlan(Integer id) {
+        HttpRespMsg msg=new HttpRespMsg();
+        Report one = reportService.getOne(new LambdaQueryWrapper<Report>().eq(id!=null,Report::getPlanId, id).last("LIMIT 1"));
+        if(one==null){
+            //删除计划
+            removeById(id);
+            //删除计划下面相关数据
+            planSteelStampNumberService.remove(new LambdaQueryWrapper<PlanSteelStampNumber>().eq(PlanSteelStampNumber::getPlanId,id));
+            List<PlanProcedureTotal> list = planProcedureTotalService.list(new LambdaQueryWrapper<PlanProcedureTotal>().eq(PlanProcedureTotal::getPlanId, id));
+            List<Integer> ids = list.stream().map(PlanProcedureTotal::getId).collect(Collectors.toList());
+            if(ids!=null&&ids.size()>0){
+                prodProcedureTeamService.remove(new LambdaQueryWrapper<ProdProcedureTeam>().in(ProdProcedureTeam::getPlanProcedureId,ids));
+                planProcedureTotalService.removeByIds(ids);
+            }
+            return msg;
+        }
+        msg.setError("‘已有员工报工，删除失败");
+        return msg;
+    }
 }