修改删除项目逻辑

src/main/java/cn/chnmuseum/party/web/controller/LearningProjectController.java

@@ -135,7 +135,7 @@ public class LearningProjectController extends BaseController {
                 return getFailResult();
             }
             resultMsg.append("项目信息修改成功,");
-        }else {
+        } else {
             resultMsg.append("未修改项目信息,");
         }
 
@@ -143,7 +143,9 @@ public class LearningProjectController extends BaseController {
         LambdaQueryWrapper<LearningContent> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(LearningContent::getLearningProjectId, learningProject.getId());
         queryWrapper.eq(LearningContent::getIsMajor, true);
-        LearningContent one = this.learningContentService.getOne(queryWrapper);
+        LearningContent content = this.learningContentService.getOne(queryWrapper);
+        Map<String, Object> map = this.learningContentController.getById(content.getId());
+        LearningContent one = (LearningContent) map.get("data");
         if (one == null) {
             return getFailResult("该学习项目下没有主学习内容");
         }
@@ -184,7 +186,7 @@ public class LearningProjectController extends BaseController {
                     stringBuilder.append(s.getName());
                     if (copyrightOwners.get(copyrightOwners.size() - 1).equals(s)) {
                         stringBuilder.append("，");
-                    }else{
+                    } else {
                         stringBuilder.append("、");
                     }
                 });
@@ -207,7 +209,7 @@ public class LearningProjectController extends BaseController {
                     stringBuilder.append(s.getName());
                     if (learningContentBoardCats.get(learningContentBoardCats.size() - 1).equals(s)) {
                         stringBuilder.append("，");
-                    }else{
+                    } else {
                         stringBuilder.append("、");
                     }
                 });
@@ -234,9 +236,10 @@ public class LearningProjectController extends BaseController {
                     stringBuilder.append(s.getName());
                     if (exhibitionBoards.get(exhibitionBoards.size() - 1).equals(s)) {
                         stringBuilder.append("，");
-                    }else{
+                    } else {
                         stringBuilder.append("、");
-                    }});
+                    }
+                });
                 return getFailResult("展板：" + stringBuilder + "被子学习内容使用，不能被删除，更新失败！");
             }
         }
@@ -248,10 +251,10 @@ public class LearningProjectController extends BaseController {
                 .cover(learningProject.getCover())
                 .exhibitionBoardCatIdList(learningProject.getExhibitionBoardCatIdList())
                 .exhibitionBoardIdList(learningProject.getExhibitionBoardIdList()).build();
-        Map<String, Object> map = this.learningContentController.updateLearningContent(learningContent);
+        Map<String, Object> resultMap = this.learningContentController.updateLearningContent(learningContent);
         resultMsg.append("修改学习内容已提交，待审核！");
-        if (map.get("resultCode").equals("200")) {
-            map.replace("message",resultMsg);
+        if (resultMap.get("resultCode").equals("200")) {
+            resultMap.replace("message", resultMsg);
         }
         return map;
     }
@@ -303,10 +306,10 @@ public class LearningProjectController extends BaseController {
                     .eq(LearningContent::getLearningProjectId, learningProject.getId());
             List<LearningContent> learningContentList = this.learningContentService.list(lambdaQueryWrapper);
             List<String> learningContentNameList = new ArrayList<>();
-            learningContentList.forEach(s->{
+            learningContentList.forEach(s -> {
                 if (s.getIsMajor()) {
                     learningProject.setAuditStatus(s.getAuditStatus());
-                }else {
+                } else {
                     learningContentNameList.add(s.getName());
                 }
             });
@@ -345,21 +348,23 @@ public class LearningProjectController extends BaseController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String", required = true)
     })
+    @Transactional
     @MethodLog(operModule = OperModule.LEARNPROJECT, operType = OperType.DELETE)
     public Map<String, Object> deleteLearningProject(@PathVariable("id") String id) {
         // 项目下的学习内容id
-//        LambdaQueryWrapper<LearningContent> queryWrapper = Wrappers.<LearningContent>lambdaQuery();
-//        queryWrapper.eq(LearningContent::getLearningProjectId, id);
-//        queryWrapper.select(LearningContent::getId);
-//        List<String> list = this.learningContentService.listObjs(queryWrapper, Object::toString);
-        // 删除
-//        this.learningContentBoardService.remove(Wrappers.<LearningContentBoard>lambdaUpdate().in(LearningContentBoard::getLearningContentId, list));
-        //按照王亭亭的要求 删除学习项目，不删除学习内容 所以注释掉下面一行代码
-//        this.learningContentService.remove(Wrappers.<LearningContent>lambdaUpdate().eq(LearningContent::getLearningProjectId, id));
-        int count = this.learningContentService.count(Wrappers.<LearningContent>lambdaUpdate().eq(LearningContent::getLearningProjectId, id).last("LIMIT 1"));
-        if (count >= 1) {
-            return getFailResult("该项目已有关联学习内容，不能删除");
-        }
+        LambdaQueryWrapper<LearningContent> queryWrapper = Wrappers.<LearningContent>lambdaQuery();
+        queryWrapper.eq(LearningContent::getLearningProjectId, id);
+        queryWrapper.select(LearningContent::getId);
+        List<String> list = this.learningContentService.listObjs(queryWrapper, Object::toString);
+        // 删除学习内容和展板关联关系
+        this.learningContentBoardService.remove(Wrappers.<LearningContentBoard>lambdaUpdate().in(LearningContentBoard::getLearningContentId, list));
+        // 删除学习内容和展板分类的关联关系
+        this.learningContentBoardCatService.remove(Wrappers.<LearningContentBoardCat>lambdaUpdate().in(LearningContentBoardCat::getLearningContentId, list));
+        // 删除学习内容和展板版权方的关联关系
+        this.learningContentCopyrightOwnerService.remove(Wrappers.<LearningContentCopyrightOwner>lambdaUpdate().in(LearningContentCopyrightOwner::getLearningContentId, list));
+        // 删除学习内容
+        this.learningContentService.remove(Wrappers.<LearningContent>lambdaUpdate().eq(LearningContent::getLearningProjectId, id));
+        // 删除学习项目
         this.learningProjectService.removeById(id);
         return getSuccessResult();
     }