3.4.0 update

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/api/ObeCourseEvaluationController.java → distributed-print/src/main/java/com/qmth/distributed/print/api/obe/ObeCourseEvaluationController.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.obe.api;
+package com.qmth.distributed.print.api.obe;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/api/ObeCourseOutlineController.java → distributed-print/src/main/java/com/qmth/distributed/print/api/obe/ObeCourseOutlineController.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.obe.api;
+package com.qmth.distributed.print.api.obe;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.EditResult;

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/api/ObeCourseTargetController.java → distributed-print/src/main/java/com/qmth/distributed/print/api/obe/ObeCourseTargetController.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.obe.api;
+package com.qmth.distributed.print.api.obe;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/api/ObeCourseWeightController.java → distributed-print/src/main/java/com/qmth/distributed/print/api/obe/ObeCourseWeightController.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.obe.api;
+package com.qmth.distributed.print.api.obe;
 
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/api/ObeCultureProgramController.java → distributed-print/src/main/java/com/qmth/distributed/print/api/obe/ObeCultureProgramController.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.obe.api;
+package com.qmth.distributed.print.api.obe;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/api/ObeReportController.java → distributed-print/src/main/java/com/qmth/distributed/print/api/obe/ObeReportController.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.obe.api;
+package com.qmth.distributed.print.api.obe;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/api/TCFinalScoreController.java → distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TCFinalScoreController.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.obe.api;
+package com.qmth.distributed.print.api.obe;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/api/TCPaperStructController.java → distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TCPaperStructController.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.obe.api;
+package com.qmth.distributed.print.api.obe;
 
 import com.google.gson.reflect.TypeToken;
 import com.qmth.boot.api.annotation.Aac;

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/api/TCUsualScoreController.java → distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TCUsualScoreController.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.obe.api;
+package com.qmth.distributed.print.api.obe;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.gson.reflect.TypeToken;

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/api/TRBasicInfoController.java → distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TRBasicInfoController.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.obe.api;
+package com.qmth.distributed.print.api.obe;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/mapper/BasicProfessionalMapper.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
-import com.qmth.teachcloud.obe.been.dto.professional.ProfessionalDto;
 import com.qmth.teachcloud.common.entity.BasicProfessional;
+import com.qmth.teachcloud.obe.been.dto.professional.ProfessionalDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,6 +23,4 @@ public interface BasicProfessionalMapper extends BaseMapper<BasicProfessional> {
     IPage<ProfessionalDto> pageData(@Param("page") Page<ProfessionalDto> page, @Param("schoolId") Long schoolId, @Param("name") String name, @Param("orgId") Long orgId, @Param("dpr") DataPermissionRule dpr);
 
     List<ProfessionalDto> pageData(@Param("schoolId") Long schoolId, @Param("name") String name, @Param("orgId") Long orgId, @Param("dpr") DataPermissionRule dpr);
-
-    List<BasicProfessional> listProfessional(@Param("schoolId") Long schoolId, @Param("dpr") DataPermissionRule dpr);
 }

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/BasicProfessionalService.java

@@ -25,6 +25,4 @@ public interface BasicProfessionalService extends IService<BasicProfessional> {
     Boolean saveData(BasicProfessional tpProfessional);
 
     boolean remove(Long id);
-
-    List<BasicProfessional> listProfessional();
 }

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/BasicProfessionalServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
+import com.qmth.teachcloud.common.entity.BasicProfessional;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
@@ -13,7 +14,6 @@ import com.qmth.teachcloud.common.service.BasicRoleDataPermissionService;
 import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import com.qmth.teachcloud.obe.been.dto.professional.ProfessionalDto;
-import com.qmth.teachcloud.common.entity.BasicProfessional;
 import com.qmth.teachcloud.obe.entity.ObeCultureProgram;
 import com.qmth.teachcloud.obe.mapper.BasicProfessionalMapper;
 import com.qmth.teachcloud.obe.service.BasicProfessionalService;
@@ -90,12 +90,4 @@ public class BasicProfessionalServiceImpl extends ServiceImpl<BasicProfessionalM
         return this.removeById(id);
     }
 
-    @Override
-    public List<BasicProfessional> listProfessional() {
-        Long privilegeId = ServletUtil.getCurrentPrivilegeId();
-        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(privilegeId);
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        // 未找到权限菜单，默认为本人权限
-        return this.baseMapper.listProfessional(schoolId, dpr);
-    }
 }

teachcloud-obe/src/main/resources/mapper/BasicProfessionalMapper.xml

@@ -53,30 +53,4 @@
             </if>
         </where>
     </select>
-
-    <select id="listProfessional" resultType="com.qmth.teachcloud.obe.entity.BasicProfessional"
-            parameterType="com.qmth.teachcloud.common.bean.dto.DataPermissionRule">
-        select
-        bp.id,
-        bp.name,
-        so.name orgName
-        from basic_professional bp
-        left join sys_org so on bp.org_id = so.id
-        <where>
-            <if test="schoolId != null">
-                and bp.school_id = #{schoolId}
-            </if>
-            <if test="dpr != null">
-                <if test="dpr.requestUserId != null">
-                    AND bp.create_id = #{dpr.requestUserId}
-                </if>
-                <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
-                    AND bp.org_id IN
-                    <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
-                </if>
-            </if>
-        </where>
-    </select>
 </mapper>

teachcloud-obe/src/main/resources/mapper/ObeCourseRequirementMatrixMapper.xml

@@ -48,11 +48,13 @@
     </select>
     <select id="findTeachCourseCodeList" resultType="java.lang.String">
         SELECT DISTINCT
-            (course_code)
+            (bc.code)
         FROM
-            teach_course
+            teach_course tc
+                LEFT JOIN
+            basic_course bc ON tc.course_id = bc.id
         <where>
-            <if test="userId !== null">
+            <if test="userId != null">
                 AND user_id = #{userId}
             </if>
         </where>