1

web/src/main/java/com/ibeetl/jlw/entity/TaskTypeParam.java

@@ -1,5 +1,7 @@
 package com.ibeetl.jlw.entity;
 
+import lombok.Data;
+
 /**
  * 类功能说明
  *
@@ -7,8 +9,11 @@ package com.ibeetl.jlw.entity;
  * @Author 许良彤
  * @Date 2022/10/29 23:44
  */
+@Data
 public class TaskTypeParam {
 
+    private Long handsOnId;
+
     private String handsOnName;
 
     private Long typeNum;
@@ -32,60 +37,4 @@ public class TaskTypeParam {
      * 报告撰写
      */
     private Boolean isRreport;
-
-    public String getHandsOnName() {
-        return handsOnName;
-    }
-
-    public void setHandsOnName(String handsOnName) {
-        this.handsOnName = handsOnName;
-    }
-
-    public Long getTypeNum() {
-        return typeNum;
-    }
-
-    public void setTypeNum(Long typeNum) {
-        this.typeNum = typeNum;
-    }
-
-    public Boolean getVideo() {
-        return isVideo;
-    }
-
-    public void setVideo(Boolean video) {
-        isVideo = video;
-    }
-
-    public Boolean getPpt() {
-        return isPpt;
-    }
-
-    public void setPpt(Boolean ppt) {
-        isPpt = ppt;
-    }
-
-    public Boolean getTheory() {
-        return isTheory;
-    }
-
-    public void setTheory(Boolean theory) {
-        isTheory = theory;
-    }
-
-    public Boolean getStep() {
-        return isStep;
-    }
-
-    public void setStep(Boolean step) {
-        isStep = step;
-    }
-
-    public Boolean getRreport() {
-        return isRreport;
-    }
-
-    public void setRreport(Boolean rreport) {
-        isRreport = rreport;
-    }
 }

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java

@@ -221,10 +221,10 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
         return teacherOpenCourseHandsOnDao.getExcelValues(teacherOpenCourseHandsOnQuery);
     }
 
-    public List<TaskTypeParam> getTaskTypeParam(Long teacherOpenCourseId) {
+    public PageQuery<TaskTypeParam> getTaskTypeParam(TeacherOpenCourseHandsOnQuery query) {
-        TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery = new TeacherOpenCourseHandsOnQuery();
+        PageQuery pageQuery = query.getPageQuery();
-        teacherOpenCourseHandsOnQuery.setTeacherOpenCourseId(teacherOpenCourseId);
+        PageQuery<TeacherOpenCourseHandsOn> teacherOpenCourseHandsOnPageQuery = queryByCondition(pageQuery);
-        List<TeacherOpenCourseHandsOn> values = getValuesByQuery(teacherOpenCourseHandsOnQuery);
+        List<TeacherOpenCourseHandsOn> values = teacherOpenCourseHandsOnPageQuery.getList();
         List<TaskTypeParam> taskTypeParamList = new ArrayList<>();
         for (TeacherOpenCourseHandsOn value : values) {
             TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery();
@@ -237,15 +237,20 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
             long count5 = valuesByQuery.stream().filter(v -> "5".equals(v.getTaskType())).count();
             TaskTypeParam taskTypeParam = new TaskTypeParam();
             taskTypeParam.setHandsOnName(value.getHandsOnName());
+            taskTypeParam.setHandsOnId(value.getHandsOnId());
             taskTypeParam.setTypeNum(count1 + count2 + count3 + count4 + count5);
-            taskTypeParam.setVideo(!(count1 == 0));
+            taskTypeParam.setIsVideo(!(count1 == 0));
-            taskTypeParam.setPpt(!(count2 == 0));
+            taskTypeParam.setIsPpt(!(count2 == 0));
-            taskTypeParam.setTheory(!(count3 == 0));
+            taskTypeParam.setIsTheory(!(count3 == 0));
-            taskTypeParam.setStep(!(count4 == 0));
+            taskTypeParam.setIsStep(!(count4 == 0));
-            taskTypeParam.setRreport(!(count5 == 0));
+            taskTypeParam.setIsRreport(!(count5 == 0));
             taskTypeParamList.add(taskTypeParam);
         }
-        return taskTypeParamList;
+        pageQuery.setList(taskTypeParamList);
+        pageQuery.setTotalRow(teacherOpenCourseHandsOnPageQuery.getTotalRow());
+        pageQuery.setPageSize(teacherOpenCourseHandsOnPageQuery.getPageSize());
+        pageQuery.setPageNumber(teacherOpenCourseHandsOnPageQuery.getPageNumber());
+        return pageQuery;
 
 
     }

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointRelationService.java

@@ -5,9 +5,11 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.util.PlatformException;
+import com.ibeetl.admin.core.util.user.CacheUserUtil;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.JsonReturnCode;
 import com.ibeetl.jlw.dao.TeacherOpenCourseKnowledgePointRelationDao;
+import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnSimulationTasksAssessment;
 import com.ibeetl.jlw.entity.TeacherOpenCourseKnowledgePointRelation;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseKnowledgePointRelationQuery;
 import lombok.extern.slf4j.Slf4j;
@@ -21,6 +23,7 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -90,12 +93,25 @@ public class TeacherOpenCourseKnowledgePointRelationService extends CoreBaseServ
     }
 
     public JsonResult add(TeacherOpenCourseKnowledgePointRelationQuery teacherOpenCourseKnowledgePointRelationQuery){
+        String teacherOpenCourseKnowledgePointIdPlural = teacherOpenCourseKnowledgePointRelationQuery.getTeacherOpenCourseKnowledgePointIdPlural();
+        String[] split = teacherOpenCourseKnowledgePointIdPlural.split(",");
+        List<TeacherOpenCourseKnowledgePointRelation> teacherOpenCourseKnowledgePointRelations = new ArrayList<>();
+        for (String s : split) {
+            TeacherOpenCourseKnowledgePointRelation teacherOpenCourseKnowledgePointRelation = teacherOpenCourseKnowledgePointRelationQuery.pojo();
+            teacherOpenCourseKnowledgePointRelation.setTeacherOpenCourseKnowledgePointId(Long.parseLong(s));
+            teacherOpenCourseKnowledgePointRelation.setCreateTime(new Date());
+            try {
+                teacherOpenCourseKnowledgePointRelation.setUserId(CacheUserUtil.getUserId());
+                teacherOpenCourseKnowledgePointRelation.setOrgId(CacheUserUtil.getCurrentOrg().getId());
+            }catch (Exception e){}
+            teacherOpenCourseKnowledgePointRelations.add(teacherOpenCourseKnowledgePointRelation);
+        }
         String msg = "";
-        TeacherOpenCourseKnowledgePointRelation teacherOpenCourseKnowledgePointRelation = teacherOpenCourseKnowledgePointRelationQuery.pojo();
+        sqlManager.lambdaQuery(TeacherOpenCourseKnowledgePointRelation.class)
-        teacherOpenCourseKnowledgePointRelationDao.insert(teacherOpenCourseKnowledgePointRelation);
+                .andEq(TeacherOpenCourseKnowledgePointRelation::getBussinessId, teacherOpenCourseKnowledgePointRelationQuery.getBussinessId())
-        teacherOpenCourseKnowledgePointRelationQuery.setTeacherOpenCourseKnowledgePointId(teacherOpenCourseKnowledgePointRelation.getTeacherOpenCourseKnowledgePointId());
+                .delete();
+        teacherOpenCourseKnowledgePointRelationDao.insertBatch(teacherOpenCourseKnowledgePointRelations);
         JsonResult jsonResult = new JsonResult();
-        jsonResult.setData(teacherOpenCourseKnowledgePointRelation.getTeacherOpenCourseKnowledgePointId());//自增的ID丢进去
         jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
         jsonResult.setMsg(msg);
         return jsonResult;

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java

@@ -228,11 +228,11 @@ public class TeacherOpenCourseHandsOnController{
      * @return
      */
     @GetMapping(MODEL + "/getHandsOnList.do")
-    public JsonResult<PageQuery<TeacherOpenCourseHandsOnList>> getHandsOnList(GetHandsOnListParam param, @SCoreUser CoreUser coreUser) {
+    public JsonResult<PageQuery> getHandsOnList(GetHandsOnListParam param, @SCoreUser CoreUser coreUser) {
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
-            PageQuery<TeacherOpenCourseHandsOnList> list = teacherOpenCourseHandsOnService.getHandsOnList(param);
+            PageQuery list = teacherOpenCourseHandsOnService.getHandsOnList(param);
             return  JsonResult.success(list);
         }
     }
@@ -495,8 +495,8 @@ public class TeacherOpenCourseHandsOnController{
      * @return
      */
     @GetMapping(MODEL + "/getTaskTypeParam.do")
-    public JsonResult<List<TaskTypeParam>> getTaskTypeParam(Long teacherOpenCourseId) {
+    public JsonResult<PageQuery> getTaskTypeParam(TeacherOpenCourseHandsOnQuery paramQuery) {
-        return JsonResult.success(teacherOpenCourseHandsOnService.getTaskTypeParam(teacherOpenCourseId));
+        return JsonResult.success(teacherOpenCourseHandsOnService.getTaskTypeParam(paramQuery));
     }
 
     /**