专业增加方向显示

ie-admin/src/main/java/com/ruoyi/web/controller/front/FrontStudentController.java

@@ -71,7 +71,7 @@ public class FrontStudentController extends BaseController {
         this.dzSubjectService = dzSubjectService;
     }
 
-    @ApiOperation("02 考试科目")
+    @ApiOperation("02 全部科目")
     @GetMapping(value = "subject")
     public AjaxResult2<List<DzSubject>> getSubject(@ApiParam("定向") @RequestParam(defaultValue = "false") boolean directed) {
         SysUser sysUser = SecurityUtils.getLoginUser().getUser();

ie-system/src/main/resources/mapper/sy/SyMajorMapper.xml

@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectSyMajorByPlan" resultMap="SyMajorResult">
-        SELECT mp.id, m.`type`, m.`code`, m.`name`, CONCAT(m2.`name`, '&gt;', m1.`name`) `ancestors`
+        SELECT mp.id, m.`type`, m.`code`, CONCAT(m.`name`, IF(mp.`majorDirection` = '', '', CONCAT('(', mp.`majorDirection`, ')'))) `name`, CONCAT(m2.`name`, '&gt;', m1.`name`) `ancestors`
         FROM `a_marjor_plan` mp
                  JOIN `sy_major` m ON mp.`majorName` = m.`name` AND mp.`level` = m.`type` AND mp.`examineeType` = m.`exam_type`
                  LEFT JOIN `sy_major` m1 ON m1.`code` = m.`parent_code` AND m1.`exam_type` = m.`exam_type` AND m1.type = m.type AND m1.level + 1 = m.level