名称修改

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

@@ -0,0 +1,3 @@
+/*2024.08.22*/
+ALTER TABLE obe_culture_program ADD grade varchar(100) NULL COMMENT '年级';
+ALTER TABLE obe_culture_program CHANGE grade grade varchar(100) NULL COMMENT '年级' AFTER professional_id;

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/been/params/ObeCourseOutlineParam.java

@@ -21,7 +21,6 @@ public class ObeCourseOutlineParam {
     private Long id;
 
     @ApiModelProperty(value = "大纲名称")
-    @NotNull(message = "课程大纲名称必填")
     private String courseOutlineName;
 
     @ApiModelProperty(value = "培养方案id")

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/entity/ObeCultureProgram.java

@@ -33,8 +33,11 @@ public class ObeCultureProgram extends BaseEntity implements Serializable {
     @NotNull(message = "请选择专业")
     private Long professionalId;
 
+    @ApiModelProperty(value = "年级")
+    @NotBlank(message = "培养方案年级不能为空")
+    private String grade;
+
     @ApiModelProperty(value = "培养方案名称")
-    @NotBlank(message = "培养方案名称不能为空")
     private String name;
 
     @ApiModelProperty(value = "培养目标数量")
@@ -50,6 +53,14 @@ public class ObeCultureProgram extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "总体描述")
     private Double expectValue;
 
+    public String getGrade() {
+        return grade;
+    }
+
+    public void setGrade(String grade) {
+        this.grade = grade;
+    }
+
     public Long getSchoolId() {
         return schoolId;
     }

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/ObeCourseOutlineServiceImpl.java

@@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import com.qmth.teachcloud.common.bean.result.DictionaryResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.service.BasicCourseService;
 import com.qmth.teachcloud.common.service.BasicRoleDataPermissionService;
 import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -67,6 +69,12 @@ public class ObeCourseOutlineServiceImpl extends ServiceImpl<ObeCourseOutlineMap
     @Resource
     TCFinalScoreService tcFinalScoreService;
 
+    @Resource
+    ObeCultureProgramService obeCultureProgramService;
+
+    @Resource
+    BasicCourseService basicCourseService;
+
     @Override
     public IPage<ObeCourseOutlineResult> findObeCourseOutlinePage(Long professionalId, Long cultureProgramId, Long courseId,
                                                                   String courseOutlineName, int pageNumber, int pageSize) {
@@ -81,8 +89,14 @@ public class ObeCourseOutlineServiceImpl extends ServiceImpl<ObeCourseOutlineMap
     @Override
     public void saveObeCourseOutline(ObeCourseOutlineParam obeCourseOutlineParams) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        String courseOutlineName = obeCourseOutlineParams.getCourseOutlineName();
         Long cultureProgramId = obeCourseOutlineParams.getCultureProgramId();
+        ObeCultureProgram obeCultureProgram = obeCultureProgramService.getById(cultureProgramId);
+        Objects.requireNonNull(obeCultureProgram, "未找到培养方案信息");
+        BasicCourse basicCourse = basicCourseService.getById(obeCourseOutlineParams.getCourseId());
+        Objects.requireNonNull(basicCourse, "未找到课程信息");
+
+        obeCourseOutlineParams.setCourseOutlineName(obeCultureProgram.getName() + "-" + basicCourse.getName());
+        String courseOutlineName = obeCourseOutlineParams.getCourseOutlineName();
         Long semesterId = obeCourseOutlineParams.getSemesterId();
         Long courseId = obeCourseOutlineParams.getCourseId();
         ObeCourseOutlineEvaluationEnum evaluationMode = obeCourseOutlineParams.getEvaluationMode();

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/ObeCultureProgramServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicProfessional;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.BasicRoleDataPermissionService;
@@ -24,6 +25,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -52,6 +54,9 @@ public class ObeCultureProgramServiceImpl extends ServiceImpl<ObeCultureProgramM
     @Resource
     private ObeCourseOutlineService obeCourseOutlineService;
 
+    @Resource
+    BasicProfessionalService basicProfessionalService;
+
     @Override
     public IPage<CultureProgramResult> pageData(Page<CultureProgramResult> page, Long professionalId, String name) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
@@ -64,7 +69,9 @@ public class ObeCultureProgramServiceImpl extends ServiceImpl<ObeCultureProgramM
     @Override
     public boolean saveData(ObeCultureProgram obeCultureProgram) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-
+        BasicProfessional basicProfessional = basicProfessionalService.getById(obeCultureProgram.getProfessionalId());
+        Objects.requireNonNull(basicProfessional, "未找到专业信息");
+        obeCultureProgram.setName(basicProfessional.getName() + "-" + obeCultureProgram.getGrade());
         ObeCultureProgram checkObeCultureProgram = this.getBySchoolIdAndName(sysUser.getSchoolId(), obeCultureProgram.getName());
         if (obeCultureProgram.getId() == null) {
             if (checkObeCultureProgram != null) {