瀏覽代碼

add:代码修改

caozixuan 1 年之前
父節點
當前提交
7e3efd6148

+ 11 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/ObeCourseOutlineResult.java

@@ -27,6 +27,9 @@ public class ObeCourseOutlineResult {
     @ApiModelProperty("课程名称")
     private String courseName;
 
+    @ApiModelProperty("课程编码")
+    private String courseCode;
+
     @ApiModelProperty("学分")
     private Integer credit;
 
@@ -96,6 +99,14 @@ public class ObeCourseOutlineResult {
         this.courseName = courseName;
     }
 
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
     public Integer getCredit() {
         return credit;
     }

+ 15 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ObeCourseTargetServiceImpl.java

@@ -137,6 +137,10 @@ public class ObeCourseTargetServiceImpl extends ServiceImpl<ObeCourseTargetMappe
             obeCourseTarget.setExpectValue(db.getExpectValue());
             obeCourseTarget.updateInfo(requestUserId);
         } else {
+            Double expectValue = findExpectValueByCourseOutlineId(obeCourseOutlineId);
+            if (Objects.nonNull(expectValue)){
+                obeCourseTarget.setExpectValue(expectValue);
+            }
             // 新增 (清空权重设置)
             obeCourseOutlineService.update(new UpdateWrapper<ObeCourseOutline>().lambda()
                     .eq(ObeCourseOutline::getId, obeCourseTarget.getObeCourseOutlineId()).set(ObeCourseOutline::getDimensionSign, SystemConstant.getDbUuid()));
@@ -320,4 +324,15 @@ public class ObeCourseTargetServiceImpl extends ServiceImpl<ObeCourseTargetMappe
         }
         return result;
     }
+
+    /**
+     * 查询预期值
+     *
+     * @param obeCourseOutlineId 课程大纲id
+     * @return 预期值
+     */
+    private Double findExpectValueByCourseOutlineId(Long obeCourseOutlineId) {
+        ObeCourseTarget obeCourseTarget = this.getOne(new QueryWrapper<ObeCourseTarget>().lambda().eq(ObeCourseTarget::getObeCourseOutlineId, obeCourseOutlineId).last(SystemConstant.LIMIT1));
+        return Objects.nonNull(obeCourseTarget) ? obeCourseTarget.getExpectValue() : null;
+    }
 }

+ 1 - 0
distributed-print-business/src/main/resources/mapper/ObeCourseOutlineMapper.xml

@@ -9,6 +9,7 @@
             oco.name AS outlineName,
             bc.id AS courseId,
             bc.name AS courseName,
+            bc.code AS courseCode,
             oco.evaluation_mode AS evaluationMode,
             oco.course_type AS courseType,
             bs.id AS semesterId,