fengji 声部去掉 tenantId, 添加模糊搜索功能

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SubjectDao.java

@@ -93,7 +93,7 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      *
      * @return
      */
-    List<Subject> findSubSubjects(@Param("tenantId") Integer tenantId);
+    List<Subject> findSubSubjects(@Param("parentSubjectId") Integer parentSubjectId);
 
     List<Subject> findBySubjectByIdList(@Param("subjectIdList") String subjectIdList);
 
@@ -162,4 +162,11 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      */
     List<StudentRegistration> getRegisterSubject(@Param("musicGroupId") String musicGroupId,
                                                  @Param("userIds") List<Integer> userIds);
+
+    /**
+     * 按id或名称模糊搜索
+     * @param search 搜索条件
+     * @return 查询结果
+     */
+    List<Subject> search(@Param("search") String search);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SubjectService.java

@@ -82,7 +82,7 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * 获取子级科目列表
      * @return
      */
-    List<Subject> findSubSubjects(Integer tenantId);
+    List<Subject> findSubSubjects(Integer parentSubjectId);
 
     List<Subject> findBySubjectByIdList(List<Integer> subjectIdList);
 
@@ -102,4 +102,11 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * @return
      */
     SubFeeSettingDto setSubjectInfo(Integer chargeTypeId);
+
+    /**
+     * 按名称和Id模糊搜索
+     * @param search 搜索条件
+     * @return 查询结果
+     */
+    List<Subject> search(String search);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectServiceImpl.java

@@ -196,8 +196,8 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
     }
 
     @Override
-    public List<Subject> findSubSubjects(Integer tenantId) {
-        return subjectDao.findSubSubjects(tenantId);
+    public List<Subject> findSubSubjects(Integer parentSubjectId) {
+        return subjectDao.findSubSubjects(parentSubjectId);
     }
 
     @Override
@@ -219,4 +219,9 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
     public SubFeeSettingDto setSubjectInfo(Integer chargeTypeId) {
         return null;
     }
+
+    @Override
+    public List<Subject> search(String search) {
+        return  subjectDao.search(search);
+    }
 }

mec-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -136,7 +136,22 @@
     </select>
     <select id="findSubSubjects" resultMap="Subject">
         SELECT * FROM `subject`
-        WHERE parent_subject_id_ != 0 AND del_flag_ = 0
+        <where>
+            parent_subject_id_ != 0 AND del_flag_ = 0
+            <if test="parentSubjectId != null and topLeverCategoryId != ''">
+                parent_subject_id_ = #{parentSubjectId}
+            </if>
+        </where>
+    </select>
+
+    <select id="search" resultType="com.ym.mec.biz.dal.entity.Subject">
+        SELECT * FROM `subject`
+        <where>
+            del_flag_ = 0
+            <if test="search != null and search != ''">
+                (id_ = #{search} or name_ like concat('%', #{search}, '%')
+            </if>
+        </where>
     </select>
 
     <sql id="querySubPageSql">
@@ -241,4 +256,5 @@
             #{userId}
         </foreach>
     </select>
+
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -318,8 +318,7 @@ public class StudentManageController extends BaseController {
     @ApiOperation(value = "获取子集科目列表")
     @GetMapping("subject/findSubSubjects")
     public Object findSubSubjects(){
-        Integer tenantId = TenantContextHolder.getTenantId();
-        return succeed(subjectService.findSubSubjects(tenantId));
+        return succeed(subjectService.findSubSubjects(null));
     }
 
     @ApiOperation(value = "获取用户所在分部的年级列表）")

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherSubjectController.java

@@ -43,10 +43,7 @@ public class TeacherSubjectController extends BaseController {
     @ApiOperation(value = "获取子集科目列表")
     @GetMapping("/findSubSubjects")
     public Object findSubSubjects(Integer tenantId){
-        if(tenantId == null){
-            tenantId = TenantContextHolder.getTenantId();
-        }
-        return succeed(subjectService.findSubSubjects(tenantId));
+        return succeed(subjectService.findSubSubjects(null));
     }
 
 }

mec-web/src/main/java/com/ym/mec/web/controller/SubjectController.java

@@ -94,10 +94,17 @@ public class SubjectController extends BaseController {
         return succeed(subjectService.findSubApplyDetail(musicGroupId));
     }
 
-    @ApiOperation(value = "获取子集科目列表")
+    @ApiOperation(value = "获取子集科目列表按父Id")
     @GetMapping("/findSubSubjects")
     @PreAuthorize("@pcs.hasPermissions('subject/findSubSubjects')")
-    public Object findSubSubjects(Integer tenantId){
-        return succeed(subjectService.findSubSubjects(tenantId));
+    public Object findSubSubjects(Integer parentSubjectId){
+        return succeed(subjectService.findSubSubjects(parentSubjectId));
+    }
+
+    @ApiOperation(value = "搜索按Id和名称")
+    @GetMapping("/search")
+    @PreAuthorize("@pcs.hasPermissions('subject/search')")
+    public Object search(String search){
+        return succeed(subjectService.search(search));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/EduRepairController.java

@@ -138,7 +138,7 @@ public class EduRepairController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        return succeed(subjectService.findSubSubjects(1));
+        return succeed(subjectService.findSubSubjects( null));
     }
 
     @ApiOperation("获取学生信息")

mec-web/src/main/java/com/ym/mec/web/controller/education/EduSubjectController.java

@@ -25,7 +25,7 @@ public class EduSubjectController extends BaseController {
     @ApiOperation(value = "获取子集科目列表")
     @GetMapping("/findSubSubjects")
     public Object findSubSubjects(Integer tenantId){
-        return succeed(subjectService.findSubSubjects(tenantId));
+        return succeed(subjectService.findSubSubjects(null));
     }
 
     @ApiOperation(value = "根据科目编号查询科目")