xiangpei
2024-05-30 de723adff546eb1249dd33ab6aa898deb930de75
编辑试卷时选择部门出现对应的课目
5个文件已修改
37 ■■■■■ 已修改文件
src/main/java/com/mindskip/xzs/controller/admin/EducationController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/repository/SubjectMapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/service/SubjectService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/SubjectMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mindskip/xzs/controller/admin/EducationController.java
@@ -43,6 +43,12 @@
        return RestResponse.ok(subjects);
    }
    @RequestMapping(value = "/subject/select/dept/{deptId}", method = RequestMethod.GET)
    public RestResponse<List<Subject>> listByDeptId(@PathVariable("deptId") Integer deptId) {
        List<Subject> subjects = subjectService.listByDeptId(deptId);
        return RestResponse.ok(subjects);
    }
    @RequestMapping(value = "/subject/page", method = RequestMethod.POST)
    public RestResponse<PageInfo<SubjectResponseVM>> pageList(@RequestBody SubjectPageRequestVM model) {
        PageInfo<Subject> pageInfo = subjectService.page(model);
@@ -91,6 +97,7 @@
        return RestResponse.ok(vm);
    }
    @RequestMapping(value = "/subject/delete/{id}", method = RequestMethod.POST)
    public RestResponse delete(@PathVariable Integer id) {
        Subject subject = subjectService.selectById(id);
src/main/java/com/mindskip/xzs/repository/SubjectMapper.java
@@ -25,4 +25,12 @@
    List<String> selectSubjectName(@Param("ids") List<Integer> ids);
    String selectSubjectNameById(Integer id);
    /**
     * 部门id查询课目
     *
     * @param deptId
     * @return
     */
    List<Subject> listByDeptId(@Param("deptId") Integer deptId);
}
src/main/java/com/mindskip/xzs/service/SubjectService.java
@@ -20,4 +20,12 @@
    List<Subject> getNames(String[] names);
    List<Subject> selectByIds(Integer[] ids);
    /**
     * 根据部门id查询课目
     *
     * @param deptId
     * @return
     */
    List<Subject> listByDeptId(Integer deptId);
}
src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java
@@ -75,4 +75,8 @@
        return subjectMapper.selectByIds(ids);
    }
    @Override
    public List<Subject> listByDeptId(Integer deptId) {
        return subjectMapper.listByDeptId(deptId);
    }
}
src/main/resources/mapper/SubjectMapper.xml
@@ -126,6 +126,16 @@
        where ts.deleted = 0
    </select>
    <select id="listByDeptId" resultMap="BaseResultMap">
        select ts.id,
               ts.name
        from t_subject ts
                 INNER JOIN t_subject_dept tsd ON tsd.subject_id = ts.id
            AND tsd.dept_id = #{deptId}
        where ts.deleted = 0
    </select>
    <select id="page" resultMap="BaseResultMap"
            parameterType="com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM">
        SELECT