add:代码修改

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

@@ -43,10 +43,17 @@ public interface ObeCourseOutlineService extends IService<ObeCourseOutline> {
     /**
      * 课程大纲删除
      *
-     * @param id id
+     * @param id 课程大纲id
      */
     void removeObeCourseOutline(Long id);
 
+    /**
+     * 删除考核设置 （自定义评价方式和权重）
+     *
+     * @param id 课程大纲id
+     */
+    void removeAssessmentSetting(Long id);
+
     /**
      * 清除课程目标、评价、权重设置
      *

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

@@ -123,7 +123,7 @@ public class ObeCourseEvaluationServiceImpl extends ServiceImpl<ObeCourseEvaluat
                     obeCourseOutlineService.clearCourseSetting(obeCourseOutlineId, CourseSettingTypeEnum.COURSE_EVALUATION);
                 } else {
                     // 该评价方式没有用到，删除权重中涉及该评价方式的记录
-                    obeCourseOutlineService.removeByIds(
+                    obeCourseWeightService.removeByIds(
                             obeCourseWeightList.stream().map(BaseEntity::getId).collect(Collectors.toList()));
                 }
             }

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

@@ -10,6 +10,7 @@ import com.qmth.distributed.print.business.bean.result.CourseWeightSettingStatus
 import com.qmth.distributed.print.business.bean.result.ObeCourseBasicInfoResult;
 import com.qmth.distributed.print.business.bean.result.ObeCourseOutlineResult;
 import com.qmth.distributed.print.business.entity.*;
+import com.qmth.distributed.print.business.enums.CourseEvaluationTypeEnum;
 import com.qmth.distributed.print.business.enums.CourseSettingTypeEnum;
 import com.qmth.distributed.print.business.enums.ObeCourseOutlineCourseTypeEnum;
 import com.qmth.distributed.print.business.enums.ObeCourseOutlineEvaluationEnum;
@@ -142,6 +143,18 @@ public class ObeCourseOutlineServiceImpl extends ServiceImpl<ObeCourseOutlineMap
         this.removeById(id);
     }
 
+    @Transactional
+    @Override
+    public void removeAssessmentSetting(Long id) {
+        // 删除课程评价方式
+        obeCourseEvaluationService.remove(
+                new QueryWrapper<ObeCourseEvaluation>().lambda()
+                        .eq(ObeCourseEvaluation::getObeCourseOutlineId, id)
+                        .eq(ObeCourseEvaluation::getType, CourseEvaluationTypeEnum.CUSTOM));
+        // 删除权重设置
+        obeCourseWeightService.deleteCourseWeight(id);
+    }
+
     @Transactional
     @Override
     public void clearCourseSetting(Long obeCourseOutlineId, CourseSettingTypeEnum courseSettingTypeEnum) {

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

@@ -69,7 +69,7 @@ public class ObeCourseWeightServiceImpl extends ServiceImpl<ObeCourseWeightMappe
             if (o1.getType().getIndex() == o2.getType().getIndex()) {
                 return o1.getEvaluationId() < o2.getEvaluationId() ? -1 : 0;
             } else {
-                return o2.getType().getIndex() - o1.getType().getIndex();
+                return o1.getType().getIndex() - o2.getType().getIndex();
             }
         }).collect(Collectors.toList());
         // 现有权重

distributed-print-business/src/main/resources/db/log/caozixuan.sql

@@ -121,4 +121,8 @@ INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, e
 UPDATE sys_privilege SET related = '3050,3051,3052,3053,3054' WHERE (id = '3044');
 
 INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('3025', '根据培养方案、课程查询指标点', '/api/admin/obe/course_target/sub_requirement/list', 'URL', '3016', '9', 'AUTH', '1', '1', '1');
-UPDATE sys_privilege SET related = '3005,3017,3018,3019,3020,3021,3022,3023,3024,3025' WHERE (id = '3016');
+UPDATE sys_privilege SET related = '3005,3017,3018,3019,3020,3021,3022,3023,3024,3025' WHERE (id = '3016');
+
+-- 2024-06-12
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('3031', '课程考核设置-删除', '/api/admin/obe/course_outline/assessment_setting_delete', 'URL', '3001', '2', 'AUTH', '1', '1', '1');
+UPDATE sys_privilege SET related = '3031' WHERE (id = '3043');

distributed-print/src/main/java/com/qmth/distributed/print/api/ObeCourseOutlineController.java

@@ -80,8 +80,17 @@ public class ObeCourseOutlineController {
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "删除成功", response = EditResult.class) })
     @OperationLogDetail(operationType = OperationTypeEnum.DELETE, detail = "删除操作，课程大纲id：[{{id}}]")
-    public Result deleteObeCourseOutline(@ApiParam(value = "选择的要删除的课程大纲id", required = true) @RequestParam Long id) {
-        obeCourseOutlineService.removeObeCourseOutline(id);
+    public Result deleteObeCourseOutline(@ApiParam(value = "选择的要删除的课程大纲id", required = true) @RequestParam String id) {
+        obeCourseOutlineService.removeObeCourseOutline(SystemConstant.convertIdToLong(id));
+        return ResultUtil.ok();
+    }
+
+    @ApiOperation(value = "课程考核设置-删除")
+    @RequestMapping(value = "/assessment_setting_delete", method = RequestMethod.POST)
+    @ApiResponses({ @ApiResponse(code = 200, message = "删除成功", response = EditResult.class) })
+    @OperationLogDetail(operationType = OperationTypeEnum.DELETE, detail = "删除操作，课程大纲id：[{{id}}]")
+    public Result deleteAssessmentSetting(@ApiParam(value = "选择的要删除的课程大纲id", required = true) @RequestParam String id) {
+        obeCourseOutlineService.removeAssessmentSetting(SystemConstant.convertIdToLong(id));
         return ResultUtil.ok();
     }