add:课程管理自测

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

@@ -98,7 +98,7 @@ public class CourseDimensionServiceImpl extends ServiceImpl<CourseDimensionMappe
                     if (StringUtils.isAllBlank(excelCourseCode, excelCourseName, firstDimensionName, secondDimensionName)) {
                         continue;
                     }
-                    if (courseCode.equals(excelCourseCode)) {
+                    if (!courseCode.equals(excelCourseCode)) {
                         errorMsgList.add(String.format("第[%s]行,课程代码异常", rowIndex));
                     }
                     list.add(courseDimensionImportDto);
@@ -143,7 +143,7 @@ public class CourseDimensionServiceImpl extends ServiceImpl<CourseDimensionMappe
         AtomicInteger firstNumber = new AtomicInteger(0);
         for (String firstDimensionName : dimensionMap.keySet()) {
             CourseDimension first = new CourseDimension();
-            int index = firstNumber.getAndIncrement();
+            int index = firstNumber.incrementAndGet();
             BeanUtils.copyProperties(temp, first);
             String firstCode = CourseDimensionCodeEnum.getCodeByIndex(index);
             first.setCode(firstCode);

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

@@ -75,6 +75,9 @@ public class CourseEvaluationServiceImpl extends ServiceImpl<CourseEvaluationMap
     public void deleteCourseEvaluation(Long id) {
         CourseEvaluation courseEvaluation = this.getById(id);
         if (Objects.nonNull(courseEvaluation)) {
+            if (CourseEvaluationTypeEnum.DEFAULT.equals(courseEvaluation.getType())){
+                throw ExceptionResultEnum.ERROR.exception(String.format("[%s]的评价方式不能删除",CourseEvaluationTypeEnum.DEFAULT.getName()));
+            }
             Long teachCourseId = courseEvaluation.getTeachCourseId();
             teachCourseService.clearCourseSetting(teachCourseId, CourseSettingTypeEnum.COURSE_EVALUATION);
             this.removeById(id);

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

@@ -147,9 +147,13 @@ public class CourseTargetServiceImpl extends ServiceImpl<CourseTargetMapper, Cou
                 new QueryWrapper<CourseDimension>().lambda().eq(CourseDimension::getTeachCourseId, teachCourseId)).stream().collect(Collectors.toMap(BaseEntity::getId,
                 v -> v));
 
-        List<CourseTarget> courseTargetResultList = this.list(
-                new QueryWrapper<CourseTarget>().lambda().ne(CourseTarget::getId, id)
-                        .eq(CourseTarget::getTeachCourseId, teachCourseId));
+        QueryWrapper<CourseTarget> courseTargetQueryWrapper = new QueryWrapper<>();
+        if (Objects.isNull(id)) {
+            courseTargetQueryWrapper.lambda().eq(CourseTarget::getTeachCourseId, teachCourseId);
+        } else {
+            courseTargetQueryWrapper.lambda().ne(CourseTarget::getId, id);
+        }
+        List<CourseTarget> courseTargetResultList = this.list(courseTargetQueryWrapper);
 
         // 占用的知识点id
         List<Long> occupiedIdList = courseTargetResultList.stream().flatMap(e -> {
@@ -186,6 +190,7 @@ public class CourseTargetServiceImpl extends ServiceImpl<CourseTargetMapper, Cou
 
         if (SystemConstant.longNotNull(id)) {
             // 编辑
+            courseTarget.setId(id);
             courseTarget.updateInfo(requestUserId);
         } else {
             // 新增

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

@@ -140,6 +140,7 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
     @Transactional
     @Override
     public void selectCreate(List<Long> basicCourseIdList, SysUser requestUser) {
+        // TODO: 2024/3/4 选择课程改造 传一个list课程对象 创建时还有加默认的评价方式
         Long schoolId = requestUser.getSchoolId();
         Long userId = requestUser.getId();
         if (CollectionUtils.isNotEmpty(basicCourseIdList)) {

distributed-print-business/src/main/resources/db/log/脚本-caozx.sql

@@ -12,4 +12,28 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('1111', '导入学生', 'Import', 'BUTTON', '1100', '6', 'AUTH', '1103', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('1112', '导出学生', 'Export', 'BUTTON', '1100', '7', 'AUTH', '1104', '1', '0', '1');
 INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('1113', '删除', 'Delete', 'LINK', '1100', '8', 'AUTH', '1105', '1', '0', '1');
-INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('1114', '批量删除', 'DeleteBatch', 'BUTTON', '1100', '9', 'AUTH', '1105', '1', '0', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `related`, `enable`, `default_auth`, `front_display`) VALUES ('1114', '批量删除', 'DeleteBatch', 'BUTTON', '1100', '9', 'AUTH', '1105', '1', '0', '1');
+
+ALTER TABLE `teach_course` 
+CHANGE COLUMN `basic_course_id` `basic_course_id` BIGINT NULL COMMENT '基础课程id' ;
+
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1115', '教学课程-查询课程权重设置状态', '/api/admin/teach/course/find_course_weight_setting_status', 'URL', '841', '14', 'AUTH', '1', '1', '1');
+-- 课程目标管理权限设置
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1116', '课程目标管理-列表查询', '/api/admin/teach/course_target/list', 'URL', '841', '15', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1117', '课程目标管理-同步题库知识点', '/api/admin/teach/course_target/dimension_sync_tiku', 'URL', '841', '16', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1118', '课程目标管理-导入课程知识点', '/api/admin/teach/course_target/dimension_import', 'URL', '841', '17', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1119', '课程目标管理-课程知识点树查询', '/api/admin/teach/course_target/dimension_tree', 'URL', '841', '18', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1120', '课程目标管理-新增/编辑', '/api/admin/teach/course_target/save', 'URL', '841', '19', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1121', '课程目标管理-删除', '/api/admin/teach/course_target/delete', 'URL', '841', '20', 'AUTH', '1', '1', '1');
+
+-- 课程评价方式管理权限设置
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1122', '评价方式管理-列表查询', '/api/admin/teach/course_evaluation/list', 'URL', '841', '21', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1123', '评价方式管理-新增', '/api/admin/teach/course_evaluation/save', 'URL', '841', '22', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1124', '评价方式管理-删除', '/api/admin/teach/course_evaluation/delete', 'URL', '841', '23', 'AUTH', '1', '1', '1');
+
+-- 课程权重设置权限设置
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1125', '权重设置-查询', '/api/admin/teach/course_weight/find', 'URL', '841', '24', 'AUTH', '1', '1', '1');
+INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence`, `property`, `enable`, `default_auth`, `front_display`) VALUES ('1126', '权重设置-保存', '/api/admin/teach/course_weight/save', 'URL', '841', '25', 'AUTH', '1', '1', '1');
+
+UPDATE `sys_privilege` SET `related` = '77,842,843,844,845,846,847,848,849,850,851,852,853,866,1115,1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126' WHERE (`id` = '841');
+

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

@@ -35,7 +35,7 @@ public class CourseWeightController {
     private CourseWeightService courseWeightService;
 
     @ApiOperation(value = "课程权重管理-列表查询")
-    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    @RequestMapping(value = "/find", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = CourseWeightDto.class) })
     public Result findCourseWeightList(@ApiParam(value = "学期id") @RequestParam(required = false) String examId,
             @ApiParam(value = "考试id") @RequestParam(required = false) String courseCode) {