开课资源增加状态，上下架

2 years ago · 71cd4a9ac6
parent 5a77396970
commit 71cd4a9ac6
6 changed files with 61 additions and 11 deletions
--- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeResourcesInfoDao.java
+++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeResourcesInfoDao.java
@ -23,6 +23,8 @@ public interface TeacherOpenCourseMergeResourcesInfoDao extends BaseMapper<Teach
    @Update
    void deleteTeacherOpenCourseMergeResourcesInfoByIds(String ids);
    @Update
+    void logicDeleteTeacherOpenCourseMergeResourcesInfo(String ids);
+    @Update
    int updateGivenByIds(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery);
    List<TeacherOpenCourseMergeResourcesInfo> getByIds(String ids);
    List<TeacherOpenCourseMergeResourcesInfo> getValuesByQuery(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery);
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java
@ -47,6 +47,9 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{

    private String resourcesInfoFiles;

+    // 资源状态 0删除 1上架 2下架
+    private Integer resourcesInfoStatus;
+
    // 资源排序

    private String orderIndex;
@ -55,8 +58,8 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{

    private Long orgId ;
 	
-    //后台用户ID
-
+    //后台用户ID（上传人）
+    @Dict(type = "core_user.name.1=1")
    private Long userId ;
 	
    public TeacherOpenCourseMergeResourcesInfo(){
@ -177,4 +180,12 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{
    public void setOrderIndex(String orderIndex) {
        this.orderIndex = orderIndex;
    }
+
+    public Integer getResourcesInfoStatus() {
+        return resourcesInfoStatus;
+    }
+
+    public void setResourcesInfoStatus(Integer resourcesInfoStatus) {
+        this.resourcesInfoStatus = resourcesInfoStatus;
+    }
 }
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
@ -91,6 +91,13 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
            throw new PlatformException("批量删除开课资源拉取失败", e);
        }
    }
+    public void logicDeleteTeacherOpenCourseMergeResourcesInfo(String ids){
+        try {
+            teacherOpenCourseMergeResourcesInfoDao.logicDeleteTeacherOpenCourseMergeResourcesInfo(ids);
+        } catch (Exception e) {
+            throw new PlatformException("批量删除开课资源拉取失败", e);
+        }
+    }

    public String addAll(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery){
        String msg = "";
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesInfoController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesInfoController.java
@ -135,7 +135,7 @@ public class TeacherOpenCourseMergeResourcesInfoController{
    @ResponseBody
    public JsonResult deleteDo(String ids, @SCoreUser CoreUser coreUser) {
        teacherOpenCourseMergeResourcesInfoService.validateIsTeacher(ids, coreUser);
-        teacherOpenCourseMergeResourcesInfoService.deleteTeacherOpenCourseMergeResourcesInfo(ids);
+        teacherOpenCourseMergeResourcesInfoService.logicDeleteTeacherOpenCourseMergeResourcesInfo(ids);
        return JsonResult.success();
    }

@ -254,7 +254,7 @@ public class TeacherOpenCourseMergeResourcesInfoController{
    @Function("teacherOpenCourseMergeResourcesInfo.delete")
    @ResponseBody
    public JsonResult delete(String ids) {
-        teacherOpenCourseMergeResourcesInfoService.deleteTeacherOpenCourseMergeResourcesInfo(ids);
+        teacherOpenCourseMergeResourcesInfoService.logicDeleteTeacherOpenCourseMergeResourcesInfo(ids);
        return JsonResult.success();
    }

--- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeResourcesInfoQuery.java
@ -28,6 +28,8 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam {
    private String resourcesInfoFiles;
    @Query(name = "资源排序", display = false)
    private String orderIndex;
+    // 资源状态 0删除 1上架 2下架
+    private Integer resourcesInfoStatus;
    @Query(name = "组织机构ID", display = false)
    private Long orgId;
    @Query(name = "后台用户ID", display = false)
@ -96,6 +98,7 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam {
        pojo.setResourcesInfoContent(this.getResourcesInfoContent());
        pojo.setResourcesInfoFiles(this.getResourcesInfoFiles());
        pojo.setOrderIndex(this.getOrderIndex());
+        pojo.setResourcesInfoStatus(this.getResourcesInfoStatus());
        pojo.setOrgId(this.getOrgId());
        pojo.setUserId(this.getUserId());
        return pojo;
@ -169,4 +172,12 @@ public class TeacherOpenCourseMergeResourcesInfoQuery extends PageParam {
    public void setOrderIndex(String orderIndex) {
        this.orderIndex = orderIndex;
    }
+
+    public Integer getResourcesInfoStatus() {
+        return resourcesInfoStatus;
+    }
+
+    public void setResourcesInfoStatus(Integer resourcesInfoStatus) {
+        this.resourcesInfoStatus = resourcesInfoStatus;
+    }
 }
--- a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md
+++ b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesInfo.md
@ -29,7 +29,7 @@ queryByCondition
  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
  @}
  @if(!isEmpty(resourcesInfoName)){
-  and t.resources_info_name =#resourcesInfoName#
+  and t.resources_info_name like #'%'+resourcesInfoName+'%'#
  @}
  @if(!isEmpty(resourcesInfoType)){
  and t.resources_info_type =#resourcesInfoType#
@ -37,6 +37,12 @@ queryByCondition
  @if(!isEmpty(resourcesInfoContent)){
  and t.resources_info_content =#resourcesInfoContent#
  @}
+  @if(isEmpty(resourcesInfoStatus)){
+  @// 默认为空不查询删除状态的数据
+  and t.resources_info_status != 0
+  @} else {
+  and t.resources_info_status =#resourcesInfoStatus#
+  @}
  @if(!isEmpty(orgId)){
  and t.org_id =#orgId#
  @}
@ -80,7 +86,7 @@ queryByConditionQuery
  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
  @}
  @if(!isEmpty(resourcesInfoName)){
-  and t.resources_info_name =#resourcesInfoName#
+  and t.resources_info_name like #'%'+resourcesInfoName+'%'#
  @}
  @if(!isEmpty(resourcesInfoType)){
  and t.resources_info_type =#resourcesInfoType#
@ -88,6 +94,12 @@ queryByConditionQuery
  @if(!isEmpty(resourcesInfoContent)){
  and t.resources_info_content =#resourcesInfoContent#
  @}
+  @if(isEmpty(resourcesInfoStatus)){
+  @// 默认为空不查询删除状态的数据
+  and t.resources_info_status != 0
+  @} else {
+  and t.resources_info_status =#resourcesInfoStatus#
+  @}
  @if(!isEmpty(orgId)){
  and t.org_id =#orgId#
  @}
@ -111,7 +123,14 @@ deleteTeacherOpenCourseMergeResourcesInfoByIds

  delete from teacher_open_course_merge_resources_info where find_in_set(teacher_open_course_merge_resources_info_id,#ids#)

+logicDeleteTeacherOpenCourseMergeResourcesInfo
+===
+
+* 批量逻辑删除（0删除 1上架 2下架）

+  update teacher_open_course_merge_resources_info set resources_info_status = 0
+  where 1 = 1
+  and find_in_set(teacher_open_course_merge_resources_info_id,#ids#) and resources_info_status != 0

 getByIds
 ===
@ -198,7 +217,7 @@ getTeacherOpenCourseMergeResourcesInfoValues
  and t.teacher_open_course_id =#teacherOpenCourseId#
  @}
  @if(!isEmpty(resourcesInfoName)){
-  and t.resources_info_name =#resourcesInfoName#
+  and t.resources_info_name like #'%'+resourcesInfoName+'%'#
  @}
  @if(!isEmpty(resourcesInfoType)){
  and t.resources_info_type =#resourcesInfoType#
@ -241,7 +260,7 @@ getValuesByQuery
  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
  @}
  @if(!isEmpty(resourcesInfoName)){
-  and t.resources_info_name =#resourcesInfoName#
+  and t.resources_info_name like #'%'+resourcesInfoName+'%'#
  @}
  @if(!isEmpty(resourcesInfoType)){
  and t.resources_info_type =#resourcesInfoType#
@ -290,7 +309,7 @@ getValuesByQueryNotWithPermission
  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
  @}
  @if(!isEmpty(resourcesInfoName)){
-  and t.resources_info_name =#resourcesInfoName#
+  and t.resources_info_name like #'%'+resourcesInfoName+'%'#
  @}
  @if(!isEmpty(resourcesInfoType)){
  and t.resources_info_type =#resourcesInfoType#
@ -348,7 +367,7 @@ getExcelValues
  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
  @}
  @if(!isEmpty(resourcesInfoName)){
-  and t.resources_info_name =#resourcesInfoName#
+  and t.resources_info_name like #'%'+resourcesInfoName+'%'#
  @}
  @if(!isEmpty(resourcesInfoType)){
  and t.resources_info_type =#resourcesInfoType#
@ -398,7 +417,7 @@ getExcelValues
  and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
  @}
  @if(!isEmpty(resourcesInfoName)){
-  and t.resources_info_name =#resourcesInfoName#
+  and t.resources_info_name like #'%'+resourcesInfoName+'%'#
  @}
  @if(!isEmpty(resourcesInfoType)){
  and t.resources_info_type =#resourcesInfoType#