From 753dcdb3675add3ef7fe1064c329b49d48484377 Mon Sep 17 00:00:00 2001
From: yangdj <18302547071@163>
Date: Tue, 15 Nov 2022 11:57:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E7=9B=B8=E5=85=B3=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=8F=8A=E5=AE=9E=E8=AE=AD=E6=89=80=E7=BC=BA=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TeacherOpenCourseHandsOnService.java      |  1 +
 .../TeacherOpenCourseHandsOnController.java   |  5 +--
 ...herOpenCourseKnowledgePointController.java | 37 +++++++++++++++++++
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java
index 44880371..3791c189 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java
@@ -243,6 +243,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
             taskTypeParam.setTheory(!(count3 == 0));
             taskTypeParam.setStep(!(count4 == 0));
             taskTypeParam.setRreport(!(count5 == 0));
+            taskTypeParamList.add(taskTypeParam);
         }
         return taskTypeParamList;
 
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java
index 09533290..29f04af0 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java
@@ -495,11 +495,10 @@ public class TeacherOpenCourseHandsOnController{
      * @return
      */
     @GetMapping(MODEL + "/getTaskTypeParam.do")
-    public List<TaskTypeParam> getTaskTypeParam(Long teacherOpenCourseId) {
-        return teacherOpenCourseHandsOnService.getTaskTypeParam(teacherOpenCourseId);
+    public JsonResult<List<TaskTypeParam>> getTaskTypeParam(Long teacherOpenCourseId) {
+        return JsonResult.success(teacherOpenCourseHandsOnService.getTaskTypeParam(teacherOpenCourseId));
     }
 
-
     /**
      * 实操删除
      * @param ids
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointController.java
index 9706da85..7446bcef 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseKnowledgePointController.java
@@ -78,6 +78,43 @@ public class TeacherOpenCourseKnowledgePointController{
         }
     }
 
+    /**
+     * 添加修改都用这一个  根据teacherOpenCourseKnowledgePointId是否存在判断是添加还是修改
+     * @param teacherOpenCourseKnowledgePointQuery
+     * @param result
+     * @param coreUser
+     * @return
+     */
+    @PostMapping(API + "/add.do")
+    public JsonResult addApi(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseKnowledgePointQuery teacherOpenCourseKnowledgePointQuery, BindingResult result,@SCoreUser CoreUser coreUser){
+        if(result.hasErrors()){
+            return JsonResult.failMessage(result);
+        }else{
+            if(teacherOpenCourseKnowledgePointQuery.getTeacherOpenCourseKnowledgePointId() == null){
+                teacherOpenCourseKnowledgePointQuery.setUserId(coreUser.getId());
+                teacherOpenCourseKnowledgePointQuery.setOrgId(coreUser.getOrgId());
+                teacherOpenCourseKnowledgePointQuery.setCreateTime(new Date());
+                teacherOpenCourseKnowledgePointQuery.setDelFlag(0);
+                return teacherOpenCourseKnowledgePointService.add(teacherOpenCourseKnowledgePointQuery);
+            }else {
+                teacherOpenCourseKnowledgePointQuery.setUserId(null);
+                teacherOpenCourseKnowledgePointQuery.setOrgId(null);
+                String msg = teacherOpenCourseKnowledgePointService.edit(teacherOpenCourseKnowledgePointQuery);
+                if (StringUtils.isBlank(msg)) {
+                    return JsonResult.success();
+                } else {
+                    return JsonResult.failMessage("更新失败,"+msg);
+                }
+            }
+        }
+    }
+
+    @PostMapping(API + "/delete.do")
+    @ResponseBody
+    public JsonResult deleteApi(String ids) {
+        teacherOpenCourseKnowledgePointService.deleteTeacherOpenCourseKnowledgePoint(ids);
+        return JsonResult.success();
+    }
 
     /* 后台页面 */