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

# Conflicts:
#	distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TRExamStudentServiceImpl.java

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/ObeScoreResult.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date: 2024-06-13
  */
 public class ObeScoreResult {
+
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "课程大纲id")
     private Long obeCourseOutlineId;
@@ -19,10 +20,10 @@ public class ObeScoreResult {
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "培养方案id")
-    private Long obeCultureProgramId;
+    private Long cultureProgramId;
 
     @ApiModelProperty(value = "培养方案名称")
-    private String obeCultureProgramName;
+    private String cultureProgramName;
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "课程id")
@@ -61,20 +62,20 @@ public class ObeScoreResult {
         this.obeCourseOutlineName = obeCourseOutlineName;
     }
 
-    public Long getObeCultureProgramId() {
-        return obeCultureProgramId;
+    public Long getCultureProgramId() {
+        return cultureProgramId;
     }
 
-    public void setObeCultureProgramId(Long obeCultureProgramId) {
-        this.obeCultureProgramId = obeCultureProgramId;
+    public void setCultureProgramId(Long cultureProgramId) {
+        this.cultureProgramId = cultureProgramId;
     }
 
-    public String getObeCultureProgramName() {
-        return obeCultureProgramName;
+    public String getCultureProgramName() {
+        return cultureProgramName;
     }
 
-    public void setObeCultureProgramName(String obeCultureProgramName) {
-        this.obeCultureProgramName = obeCultureProgramName;
+    public void setCultureProgramName(String cultureProgramName) {
+        this.cultureProgramName = cultureProgramName;
     }
 
     public Long getCourseId() {

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

@@ -22,11 +22,11 @@ public interface TCUsualScoreService extends IService<TCUsualScore> {
     /**
      * 平时成绩导入
      * @param file excel
-     * @param obeCultureProgramId 培养方案id
+     * @param cultureProgramId 培养方案id
      * @param courseId 课程id
      * @return 结果
      */
-    public Map<String, String> usualScoreExcelImport(MultipartFile file, Long obeCultureProgramId,Long courseId) throws IOException;
+    public Map<String, String> usualScoreExcelImport(MultipartFile file, Long cultureProgramId,Long courseId) throws IOException;
 
     /**
      * 平时成绩列表（分页）

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

@@ -43,12 +43,12 @@ public interface TRExamStudentService extends IService<TRExamStudent> {
 
     /**
      * 根据考试id/课程编码/试卷编码删除数据
-     * @param obeCultureProgramId obeCultureProgramId
+     * @param cultureProgramId cultureProgramId
      * @param courseId courseId
      * @param paperNumber paperNumber
      * @return 结果
      */
-    public Boolean remove(Long obeCultureProgramId, Long courseId, String paperNumber);
+    public Boolean remove(Long cultureProgramId, Long courseId, String paperNumber);
 
     /**
      * 学生毕业要求达成度

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

@@ -83,10 +83,10 @@ public class ObeCourseOutlineServiceImpl extends ServiceImpl<ObeCourseOutlineMap
 
         ObeCourseOutline checkUnique = this.getOne(new QueryWrapper<ObeCourseOutline>().lambda()
                 .eq(ObeCourseOutline::getCultureProgramId, cultureProgramId)
-                .eq(ObeCourseOutline::getName, courseOutlineName).last(SystemConstant.LIMIT1));
+                .eq(ObeCourseOutline::getCourseId, courseId).last(SystemConstant.LIMIT1));
         if (Objects.nonNull(checkUnique)) {
             if (!Objects.equals(checkUnique.getId(), id)) {
-                throw new RuntimeException("该课程大纲名称已存在");
+                throw new RuntimeException("该课程已经创建了课程大纲不能重复创建");
             }
         }
 

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

@@ -7,7 +7,6 @@ import com.qmth.boot.api.exception.ApiException;
 import com.qmth.boot.tools.excel.ExcelReader;
 import com.qmth.boot.tools.excel.enums.ExcelType;
 import com.qmth.distributed.print.business.bean.dto.TCUsualScoreDto;
-import com.qmth.distributed.print.business.entity.ObeCourseOutline;
 import com.qmth.distributed.print.business.entity.TCUsualScore;
 import com.qmth.distributed.print.business.mapper.TCUsualScoreMapper;
 import com.qmth.distributed.print.business.service.ObeCourseOutlineService;
@@ -65,15 +64,13 @@ public class TCUsualScoreServiceImpl extends ServiceImpl<TCUsualScoreMapper, TCU
 
     @Override
     @Transactional
-    public Map<String, String> usualScoreExcelImport(MultipartFile file, Long obeCultureProgramId,Long courseId) {
+    public Map<String, String> usualScoreExcelImport(MultipartFile file, Long cultureProgramId, Long courseId) {
         log.debug("导入Excel开始...");
         long start = System.currentTimeMillis();
-        ObeCourseOutline obeCourseOutline = obeCourseOutlineService.findByCultureProgramIdAndCourseId(
-                obeCultureProgramId, courseId);
         Map<String, String> messageMap = new LinkedHashMap<>();
 
         BasicCourse basicCourse = basicCourseService.getById(courseId);
-        if (Objects.isNull(basicCourse)){
+        if (Objects.isNull(basicCourse)) {
             throw ExceptionResultEnum.ERROR.exception("课程不存在");
         }
 
@@ -106,7 +103,7 @@ public class TCUsualScoreServiceImpl extends ServiceImpl<TCUsualScoreMapper, TCU
                         }
                         boolean error = false;
                         List<TCUsualScoreDto> tcUsualScoreDtoList = new ArrayList<>();
-                        TCUsualScore tcUsualScore = new TCUsualScore(obeCultureProgramId,basicCourse.getId(), basicCourse.getCode(), basicCourse.getName(), null, sysUser.getId());
+                        TCUsualScore tcUsualScore = new TCUsualScore(cultureProgramId, basicCourse.getId(), basicCourse.getCode(), basicCourse.getName(), null, sysUser.getId());
                         for (int j = 0; j < strs.length; j++) {
                             if (Objects.isNull(strs[j]) || Objects.equals(strs[j].trim(), "")) {
                                 errorData.add("excel第").add((i + 1) + "").add("行[").add(columnNames[j] + "]为空;").add("\r\n");
@@ -142,11 +139,11 @@ public class TCUsualScoreServiceImpl extends ServiceImpl<TCUsualScoreMapper, TCU
                 }
                 if (!CollectionUtils.isEmpty(tcUsualScoreList)) {
                     successData.add("共导入").add(tcUsualScoreList.size() + "").add("条数据");
-                    List<TCUsualScore> tcUsualScoreDbSourceList = tcUsualScoreService.queryUsualScore(obeCultureProgramId, basicCourse.getId(), null);
+                    List<TCUsualScore> tcUsualScoreDbSourceList = tcUsualScoreService.queryUsualScore(cultureProgramId, basicCourse.getId(), null);
                     if (CollectionUtils.isEmpty(tcUsualScoreDbSourceList) || !CollectionUtils.isEqualCollection(tcUsualScoreDbSourceList, tcUsualScoreList)) {
                         tcUsualScoreService.removeByIds(tcUsualScoreDbSourceList.stream().map(BaseEntity::getId).collect(Collectors.toList()));
                         tcUsualScoreService.saveBatch(tcUsualScoreList);
-                        trBasicInfoService.clearReportData(obeCultureProgramId, basicCourse.getId(),null
+                        trBasicInfoService.clearReportData(cultureProgramId, basicCourse.getId(), null
                                 , false);
                     }
                 }

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

@@ -169,3 +169,10 @@ ALTER TABLE t_c_final_score
     ADD UNIQUE INDEX t_c_final_score_unique (culture_program_id ASC, course_id ASC, name ASC, student_code ASC)
 ;
 
+ALTER TABLE obe_course_outline
+    DROP INDEX obe_course_outline_unique ,
+    ADD UNIQUE INDEX obe_course_outline_unique (culture_program_id ASC, course_id ASC) VISIBLE;
+;
+
+UPDATE sys_privilege SET related = '77,842,843,844,845,846,847,848,849,850,851,852,853,866,1115,3018,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1128,1129' WHERE (id = '841');
+

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

@@ -71,22 +71,22 @@ public class TCUsualScoreController {
 
     @ApiOperation(value = "成绩管理列表")
     @RequestMapping(value = "/score/list", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "分页查询", response = ObeScoreResult.class) })
-    public Result scoreList(@ApiParam(value = "培养方案ID", required = true) @RequestParam Long obeCultureProgramId, @ApiParam(value = "学期ID", required = true) @RequestParam Long semesterId,
-            @ApiParam(value = "课程id") @RequestParam(required = false) Long courseId, @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = ObeScoreResult.class)})
+    public Result scoreList(@ApiParam(value = "培养方案ID", required = true) @RequestParam Long cultureProgramId, @ApiParam(value = "学期ID", required = true) @RequestParam Long semesterId,
+                            @ApiParam(value = "课程id") @RequestParam(required = false) Long courseId, @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(
-                printCommonService.scoreList(new Page<>(pageNumber, pageSize), obeCultureProgramId, semesterId, courseId));
+                printCommonService.scoreList(new Page<>(pageNumber, pageSize), cultureProgramId, semesterId, courseId));
     }
 
     @ApiOperation(value = "导入平时成绩-模板下载")
     @RequestMapping(value = "/usual_score/template_download", method = RequestMethod.POST)
     @OperationLogDetail(operationType = OperationTypeEnum.EXPORT)
-    @ApiResponses({ @ApiResponse(code = 200, message = "下载成功", response = Object.class) })
-    public void usualScoreTemplateDownload(@ApiParam(value = "培养方案id", required = true) @RequestParam Long obeCultureProgramId,
-            @ApiParam(value = "课程id", required = true) @RequestParam Long courseId) throws IOException {
+    @ApiResponses({@ApiResponse(code = 200, message = "下载成功", response = Object.class)})
+    public void usualScoreTemplateDownload(@ApiParam(value = "培养方案id", required = true) @RequestParam Long cultureProgramId,
+                                           @ApiParam(value = "课程id", required = true) @RequestParam Long courseId) throws IOException {
         ObeCourseOutline obeCourseOutline = obeCourseOutlineService.findByCultureProgramIdAndCourseId(
-                obeCultureProgramId, courseId);
+                cultureProgramId, courseId);
 
         ObeCourseWeightResult obeCourseWeightResult = trBasicInfoService.findCourseWeightResultRmi(obeCourseOutline.getId());
         List<CourseWeightDto> courseWeightDtoList = obeCourseWeightResult.getSubmitForm();
@@ -110,20 +110,20 @@ public class TCUsualScoreController {
     @ApiOperation(value = "导入平时成绩")
     @RequestMapping(value = "/usual_score/import", method = RequestMethod.POST)
     @OperationLogDetail(operationType = OperationTypeEnum.IMPORT)
-    @ApiResponses({ @ApiResponse(code = 200, message = "导入成功", response = EditResult.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "导入成功", response = EditResult.class)})
     public Result usualScoreImport(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
-            @ApiParam(value = "培养方案id", required = true) @RequestParam Long obeCultureProgramId,
-            @ApiParam(value = "课程id", required = true) @RequestParam Long courseId) throws IOException {
-        return ResultUtil.ok(tcUsualScoreService.usualScoreExcelImport(file, obeCultureProgramId,courseId));
+                                   @ApiParam(value = "培养方案id", required = true) @RequestParam Long cultureProgramId,
+                                   @ApiParam(value = "课程id", required = true) @RequestParam Long courseId) throws IOException {
+        return ResultUtil.ok(tcUsualScoreService.usualScoreExcelImport(file, cultureProgramId, courseId));
     }
 
     @ApiOperation(value = "平时成绩列表")
     @RequestMapping(value = "/usual_score/list", method = RequestMethod.POST)
-    @ApiResponses({ @ApiResponse(code = 200, message = "分页查询", response = TCUsualScore.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = TCUsualScore.class)})
     public Result usualScoreList(@ApiParam(value = "培养方案id", required = true) @RequestParam Long cultureProgramId, @ApiParam(value = "课程id", required = true) @RequestParam Long courseId,
-            @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
-            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
-            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+                                 @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
+                                 @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                                 @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         return ResultUtil.ok(
                 tcUsualScoreService.usualScoreList(new Page<>(pageNumber, pageSize), cultureProgramId, courseId, paperNumber));
     }
@@ -131,7 +131,7 @@ public class TCUsualScoreController {
     @ApiOperation(value = "平时成绩编辑")
     @RequestMapping(value = "/usual_score/edit", method = RequestMethod.POST)
     @OperationLogDetail(operationType = OperationTypeEnum.SAVE)
-    @ApiResponses({ @ApiResponse(code = 200, message = "编辑", response = TCUsualScore.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = TCUsualScore.class)})
     public Result usualScoreEdit(@ApiParam(value = "主键", required = true) @RequestParam Long id) throws IOException {
         TCUsualScore tcUsualScore = tcUsualScoreService.getById(id);
         Objects.requireNonNull(tcUsualScore, "未找到平时成绩信息");
@@ -141,10 +141,10 @@ public class TCUsualScoreController {
     @ApiOperation(value = "平时成绩保存")
     @RequestMapping(value = "/usual_score/save", method = RequestMethod.POST)
     @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
-    @ApiResponses({ @ApiResponse(code = 200, message = "保存", response = EditResult.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "保存", response = EditResult.class)})
     @Transactional
     public Result usualScoreSave(@ApiParam(value = "平时成绩信息", required = true) @Valid @RequestBody TCUsualScore tcUsualScore,
-            BindingResult bindingResult) throws IOException {
+                                 BindingResult bindingResult) throws IOException {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
@@ -177,7 +177,7 @@ public class TCUsualScoreController {
     @ApiOperation(value = "平时成绩启用/禁用")
     @RequestMapping(value = "/usual_score/enable", method = RequestMethod.POST)
     @OperationLogDetail(operationType = OperationTypeEnum.UPDATE)
-    @ApiResponses({ @ApiResponse(code = 200, message = "编辑", response = EditResult.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "编辑", response = EditResult.class)})
     @Transactional
     public Result usualScoreEnable(@ApiParam(value = "主键", required = true) @RequestParam Long id, @ApiParam(value = "启用/禁用", required = true) @RequestParam Boolean enable) throws IOException {
         TCUsualScore tcUsualScoreDb = tcUsualScoreService.getById(id);