1、授课中心

web/src/main/java/com/ibeetl/jlw/dao/TeachingManagementDao.java

@@ -19,6 +19,7 @@ import java.util.Map;
 @SqlResource("jlw.teachingManagement")
 public interface TeachingManagementDao extends BaseMapper<TeachingManagement>{
     PageQuery<TeachingManagement> queryByCondition(PageQuery query);
+
     PageQuery<TeachingManagement> queryByConditionQuery(PageQuery query);
     @Update
     void deleteTeachingManagementByIds(String ids);
@@ -30,4 +31,6 @@ public interface TeachingManagementDao extends BaseMapper<TeachingManagement>{
     List<TeachingManagement> getValuesByQuery(TeachingManagementQuery teachingManagementQuery);
     List<TeachingManagement> getValuesByQueryNotWithPermission(TeachingManagementQuery teachingManagementQuery);
     List<Map<String,Object>>getExcelValues(TeachingManagementQuery teachingManagementQuery);
+
+    PageQuery<TeachingManagement> getTeachingManagement(PageQuery query);
 }

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

@@ -57,6 +57,12 @@ public class TeachingManagementService extends CoreBaseService<TeachingManagemen
         return ret;
     }
 
+    public PageQuery<TeachingManagement> getTeachingManagement(PageQuery query) {
+        PageQuery ret = teachingManagementDao.getTeachingManagement(query);
+        queryListAfter(ret.getList());
+        return ret;
+    }
+
     public PageQuery<TeachingManagement> queryByConditionQuery(PageQuery query) {
         PageQuery ret = teachingManagementDao.queryByConditionQuery(query);
         queryListAfter(ret.getList());
@@ -82,6 +88,24 @@ public class TeachingManagementService extends CoreBaseService<TeachingManagemen
         }
     }
 
+
+    /**
+     * 根据教师删除
+     * @param teacherInfo
+     */
+    public void deleteTeacherInfo(String teacherInfo) {
+        try {
+            TeachingManagement teachingManagement = new TeachingManagement();
+            teachingManagement.setTeacherMergeClassThirdStatus(2);
+            teachingManagementDao.getSQLManager().lambdaQuery(TeachingManagement.class)
+                    .andEq(TeachingManagement::getTeacherInfo,teacherInfo)
+                    .updateSelective(teachingManagement);
+        } catch (Exception e) {
+            throw new PlatformException("批量删除授课管理失败", e);
+        }
+    }
+
+
     public String addAll(TeachingManagementQuery teachingManagementQuery) {
         String msg = "";
         List<TeachingManagement> teachingManagementList = new ArrayList<>();

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

@@ -153,7 +153,9 @@ public class TeachingManagementController{
     @ApiOperation("分页列表")
     public JsonResult<PageQuery> list(TeachingManagementQuery condition){
         PageQuery page = condition.getPageQuery();
-        teachingManagementService.queryByCondition(page);
+//        teachingManagementService.queryByCondition(page);
+        condition.setTeacherMergeClassThirdStatus(1);
+        teachingManagementService.getTeachingManagement(page);
         return JsonResult.success(page);
     }
 
@@ -234,7 +236,8 @@ public class TeachingManagementController{
     @ResponseBody
     @ApiOperation("删除")
     public JsonResult delete(String ids) {
-        teachingManagementService.deleteTeachingManagement(ids);
+//        teachingManagementService.deleteTeachingManagement(ids);
+        teachingManagementService.deleteTeacherInfo(ids);
         return JsonResult.success();
     }
 

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

@@ -472,3 +472,78 @@ getExcelValues
   )
   )t
 
+getTeachingManagement
+===
+
+* 根据不为空的参数进行查询导入需要的参数
+
+  SELECT
+  @pageTag(){
+  any_value(t.teacher_merge_class_third_id) AS teacher_merge_class_third_id,
+  any_value(t.university_faculty_info) AS university_faculty_info,
+  any_value(t.university_system_info) AS university_system_info,
+  any_value(GROUP_CONCAT(t.school_class_info SEPARATOR ',')) AS school_class_info,
+  any_value(t.teacher_merge_class_third_add_time) AS teacher_merge_class_third_add_time,
+  any_value(t.teacher_merge_class_third_status) AS teacher_merge_class_third_status,
+  any_value(t.user_id) AS user_id,
+  any_value(t.org_id) AS org_id,
+  t.teacher_info,
+  any_value(la.university_faculty_name) AS universityFacultyName,
+  any_value(lb.university_system_name) AS universitySystemName,
+  any_value(GROUP_CONCAT(lc.class_name)) AS className,
+  any_value(ld.teacher_name) AS teacherName
+  @}
+  FROM
+  teaching_management t
+  LEFT JOIN university_faculty la ON la.university_faculty_id = t.university_faculty_info
+  LEFT JOIN university_system lb ON lb.university_system_id = t.university_system_info
+  LEFT JOIN school_class lc ON FIND_IN_SET(lc.class_id,t.school_class_info)
+  LEFT JOIN teacher ld ON ld.teacher_id = t.teacher_info
+  WHERE
+  1=1
+  @if(!isEmpty(teacherMergeClassThirdId)){
+  and t.teacher_merge_class_third_id =#teacherMergeClassThirdId#
+  @}
+  @if(!isEmpty(teacherMergeClassThirdIdPlural)){
+  and find_in_set(t.teacher_merge_class_third_id,#teacherMergeClassThirdIdPlural#)
+  @}
+  @if(!isEmpty(universityFacultyInfo)){
+  and t.university_faculty_info =#universityFacultyInfo#
+  @}
+  @if(!isEmpty(universitySystemInfo)){
+  and t.university_system_info =#universitySystemInfo#
+  @}
+  @if(!isEmpty(teacherInfo)){
+  and ld.teacher_name =#teacherInfo#
+  @}
+  @if(!isEmpty(schoolClassInfo)){
+  and t.school_class_info =#schoolClassInfo#
+  @}
+  @if(!isEmpty(teacherMergeClassThirdAddTime)){
+  and t.teacher_merge_class_third_add_time =#teacherMergeClassThirdAddTime#
+  @}
+  @if(isEmpty(teacherMergeClassThirdStatus) && isEmpty(teacherMergeClassThirdStatusPlural)){
+  and t.teacher_merge_class_third_status != 2
+  @}else{
+  @if(!isEmpty(teacherMergeClassThirdStatus)){
+  and t.teacher_merge_class_third_status =#teacherMergeClassThirdStatus#
+  @}else if(!isEmpty(teacherMergeClassThirdStatusPlural)){
+  and find_in_set(t.teacher_merge_class_third_status,#teacherMergeClassThirdStatusPlural#)
+  @}
+  @}
+  @if(!isEmpty(userId)){
+  and t.user_id =#userId#
+  @}
+  @if(!isEmpty(userIdPlural)){
+  and find_in_set(t.user_id,#userIdPlural#)
+  @}
+  @if(!isEmpty(orgId)){
+  and t.org_id =#orgId#
+  @}
+  @if(!isEmpty(orgIdPlural)){
+  and find_in_set(t.org_id,#orgIdPlural#)
+  @}
+  @pageIgnoreTag(){
+  GROUP BY
+  t.teacher_info
+  @}