学校端实操列表，未完

doc/sql/mysql/2.tianze-pro-update.sql

@@ -582,3 +582,6 @@ CREATE TABLE `student_teacher_system_use_log_analysis` (
   `user_id` bigint(20) DEFAULT NULL COMMENT '用户ID',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='学生教师行为分析';
+
+
+alter table teacher_open_course_merge_course_info add column system_course_info_id bigint(20) comment '关联系统课程ID' after teacher_open_course_id;

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

@@ -31,6 +31,9 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity implements Comp
 
     private Long teacherOpenCourseId ;
 
+    // 系统课程ID
+    private Long systemCourseInfoId ;
+
 //    @UpdateIgnore
 //    @InsertIgnore
 //    @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
@@ -372,4 +375,12 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity implements Comp
     public int compareTo(TeacherOpenCourseMergeCourseInfo o) {
         return this.getTeacherOpenCourseMergeCourseInfoId().compareTo(o.getTeacherOpenCourseMergeCourseInfoId());
     }
+
+    public Long getSystemCourseInfoId() {
+        return systemCourseInfoId;
+    }
+
+    public void setSystemCourseInfoId(Long systemCourseInfoId) {
+        this.systemCourseInfoId = systemCourseInfoId;
+    }
 }

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

@@ -675,6 +675,8 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         model.setCourseInfoType(1);
         model.setCourseInfoContent(teacherOpenCourse.getTeacherOpenCourseSummary());
         model.setCourseInfoName(teacherOpenCourse.getTeacherOpenCourseTitle());
+        model.setOrgId(teacherOpenCourse.getOrgId());
+        model.setUserId(teacherOpenCourse.getUserId());
         teacherOpenCourseMergeCourseInfoService.insert(model);
     }
 
@@ -779,6 +781,12 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         CopyOptions copyOptions = CopyOptions.create().setFieldMapping(mapping);
         List<TeacherOpenCourseMergeCourseInfo> copyToList = BeanUtil.copyToList(chapterList, TeacherOpenCourseMergeCourseInfo.class, copyOptions);
 
+        copyToList.forEach(item -> {
+            // 这里系统课程ID再拷贝一份 用于记录是从哪个课程拷贝来的。
+            // 这里的teacherOpenCourseMergeCourseInfoId 暂存的还是系统课程ID
+            item.setSystemCourseInfoId(item.getTeacherOpenCourseMergeCourseInfoId());
+        });
+
         result.addAll(copyToList);
     }
 

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java

@@ -20,6 +20,9 @@ public class TeacherOpenCourseMergeCourseInfoQuery extends PageParam {
     @Query(name = "开课ID", display = false,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1")
     private Long teacherOpenCourseId;
 
+    @Query(name = "系统课程ID", display = true)
+    private Long systemCourseInfoId ;
+
     @NotEmpty(message = "章节名称不能为空", groups =ValidateConfig.ADD.class)
     @Query(name = "课程名称", display = true)
     private String courseInfoName;
@@ -287,4 +290,12 @@ public class TeacherOpenCourseMergeCourseInfoQuery extends PageParam {
     public void setInnerJoin(Boolean innerJoin) {
         this.innerJoin = innerJoin;
     }
+
+    public Long getSystemCourseInfoId() {
+        return systemCourseInfoId;
+    }
+
+    public void setSystemCourseInfoId(Long systemCourseInfoId) {
+        this.systemCourseInfoId = systemCourseInfoId;
+    }
 }

web/src/main/resources/sql/jlw/handsOn.md

@@ -53,6 +53,42 @@ queryByCondition
   @}
 
 
+queryByConditionMergeOpenCourseHandsOn
+===
+* 查询开课实训和系统级别的实训
+
+  select
+  t.`hands_on_id`,
+  t.`course_info_id`,
+  t.`course_child_node`,
+  t.`hands_on_name`,
+  t.`add_time`,
+  t.`org_id`,
+  t.`user_id`,
+  a.course_info_id,
+  a.course_info_full_id,
+  'ADMIN_ADD' as data_type
+  from hands_on t
+  LEFT JOIN course_info a on t.course_info_id = a.course_info_id
+  union all
+  select
+  t.`hands_on_id`,
+  t.`course_info_id`,
+  t.`course_child_node`,
+  t.`hands_on_name`,
+  t.`add_time`,
+  t.`org_id`,
+  t.`user_id`,
+  a.course_info_id,
+  a.course_info_full_id,
+  'FACULTY_ADD' as data_type
+  from teacher_open_course_hands_on t
+  LEFT JOIN course_info a on t.course_info_id = a.course_info_id
+  LEFT JOIN teacher_open_course_merge_course_info b on b.system_course_info_id = a.course_info_id
+
+
+
+
 queryByConditionQuery
 ===
 * 根据不为空的参数进行分页查询(无权限)

web/src/main/resources/templates/jlw/handsOn/index.html

@@ -55,6 +55,16 @@
                                     id="handsOnStatu" name="handsOnStatus"/>
         </div>
     </div>
+<!--    <div class="layui-inline">-->
+<!--        <label class="layui-form-label">案例来源：</label>-->
+<!--        <div class="layui-input-block">-->
+<!--            <select name="handsOnFrom" lay-filter="selectHandsOnFrom">-->
+<!--                <option value="">请选择</option>-->
+<!--                <option value="ADMIN_ADD">系统内置</option>-->
+<!--                <option value="FACULTY_ADD">院校添加</option>-->
+<!--            </select>-->
+<!--        </div>-->
+<!--    </div>-->
 </layui:searchForm>
 <div class="layui-btn-group">
     <!--#if(user.get().isAdmin){ -->

web/tianzePro_B_Restart.sh

@@ -4,6 +4,8 @@ LOG_PATH=/data/logs
 
 rm -rf ${HOME_PATH}/web-1.0.jar
 mkdir -p ${HOME_PATH}
+mkdir -p ${LOG_PATH}
+
 tar zxvf /home/admin/app/tianzepro-package.tgz -C ${HOME_PATH}
 
 ps -ef | grep java | grep web | grep -v grep | awk '{print$2}' | xargs kill -9