Merge remote-tracking branch 'origin/dev_v3.3.4' into dev_v3.3.4

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ObeCultureProgramServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -46,6 +47,8 @@ public class ObeCultureProgramServiceImpl extends ServiceImpl<ObeCultureProgramM
     private ObeCourseRequirementMatrixService obeCourseRequirementMatrixService;
     @Resource
     private BasicRoleDataPermissionService basicRoleDataPermissionService;
+    @Resource
+    private ObeCourseOutlineService obeCourseOutlineService;
 
     @Override
     public IPage<CultureProgramResult> pageData(Page<CultureProgramResult> page, Long professionalId, String name) {
@@ -96,6 +99,11 @@ public class ObeCultureProgramServiceImpl extends ServiceImpl<ObeCultureProgramM
         obeCultureProgramCourseService.removeByCultureProgramId(id);
         // 删除课程毕业要求关系矩阵
         obeCourseRequirementMatrixService.removeMatrixByCondition(new ObeCourseRequirementMatrix(id, null, null, null));
+        // 删除课程大纲
+        List<ObeCourseOutline> obeCourseOutlines = obeCourseOutlineService.findByCultureProgramId(id);
+        for (ObeCourseOutline obeCourseOutline : obeCourseOutlines) {
+            obeCourseOutlineService.removeObeCourseOutline(obeCourseOutline.getId());
+        }
         return true;
     }
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -260,7 +260,7 @@ public class SystemConstant {
     public static final String ID = "id";
     public static final String MODEL = "model";
     public static final String VERSION = "version";
-    public static final String VERSION_VALUE = "3.3.3.1";
+    public static final String VERSION_VALUE = "3.3.4.1";
     public static final String FLOW_ENTITY_ID = "flowEntityId";
     public static final String CUSTOM_FLOW_ID = "customFlowId";
     public static final String ACT_FLOW_ID = "actFlowId";