院校

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/MajorLabelController.java

@@ -54,6 +54,18 @@ public class MajorLabelController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询标签关联专业列表
+     */
+    @ApiOperation("查询标签关联专业列表")
+    @PreAuthorize("@ss.hasPermi('course:label:list')")
+    @GetMapping("/listMajor")
+    public TableDataInfo<MajorLabelVo> listMajor(MajorLabelQueryBo bo) {
+        startPage();
+        List<MajorLabelVo> list = iMajorLabelService.listMajor(bo);
+        return getDataTable(list);
+    }
+
     /**
      * 导出标签列表
      */
@@ -99,6 +111,17 @@ public class MajorLabelController extends BaseController {
         return toAjax(iMajorLabelService.updateByEditBo(bo) ? 1 : 0);
     }
 
+    /**
+     * 删除关联标签
+     */
+    @ApiOperation("删除关联标签")
+    @PreAuthorize("@ss.hasPermi('course:label:edit')")
+    @Log(title = "删除关联标签", businessType = BusinessType.UPDATE)
+    @PostMapping("/editMajor")
+    public AjaxResult<Void> editMajor(@RequestBody MajorLabelEditBo bo) {
+        return toAjax(iMajorLabelService.editMajor(bo) ? 1 : 0);
+    }
+
     /**
      * 删除标签
      */

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/MajorLabelQueryBo.java

@@ -37,6 +37,10 @@ public class MajorLabelQueryBo extends BaseEntity {
 	private String isAsc;
 
 
+	/** id */
+	@ApiModelProperty("id")
+	private Long id;
+
 	/** 标签名字 */
 	@ApiModelProperty("标签名字")
 	private String labelName;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/MajorLabelMapper.java

@@ -16,4 +16,6 @@ import java.util.Collection;
 public interface MajorLabelMapper extends BaseMapper<MajorLabel> {
 
     Collection<MajorLabelVo> queryList(MajorLabelQueryBo bo);
+
+    Collection<MajorLabelVo> listMajor(MajorLabelQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/IMajorLabelService.java

@@ -49,4 +49,8 @@ public interface IMajorLabelService extends IService<MajorLabel> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	List<MajorLabelVo> listMajor(MajorLabelQueryBo bo);
+
+	boolean editMajor(MajorLabelEditBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/MajorLabelServiceImpl.java

@@ -128,4 +128,18 @@ public class MajorLabelServiceImpl extends ServiceImpl<MajorLabelMapper, MajorLa
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public List<MajorLabelVo> listMajor(MajorLabelQueryBo bo) {
+        return entity2Vo(baseMapper.listMajor(bo));
+    }
+
+    @Override
+    public boolean editMajor(MajorLabelEditBo bo) {
+        Major major = new Major();
+        major.setId(bo.getId());
+        major.setLabelId(0L);
+        major.setUpdateTime(DateUtils.getNowTime());
+        return majorService.updateById(major);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/MajorLabelVo.java

@@ -47,6 +47,16 @@ public class MajorLabelVo {
 	@ApiModelProperty("关联专业数目")
 	private Integer num;
 
+	/** 专业名称 */
+	@Excel(name = "专业名称")
+	@ApiModelProperty("专业名称")
+	private String categoryName;
+
+	/** 专业名称ID */
+	@Excel(name = "专业ID")
+	@ApiModelProperty("专业名称ID")
+	private Long majorId;
+
 	/** 关联专业数目 */
 	@Excel(name = "专业")
 	@ApiModelProperty("专业")

zhongzheng-system/src/main/resources/mapper/modules/course/MajorLabelMapper.xml

@@ -21,6 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="encoder" column="encoder"/>
         <result property="num" column="num"/>
+        <result property="categoryName" column="category_name"/>
+        <result property="majorId" column="major_id"/>
     </resultMap>
 
     <select id="queryList" parameterType="com.zhongzheng.modules.course.bo.MajorLabelQueryBo"  resultMap="MajorLabelVoResult">
@@ -44,4 +46,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
 
     </select>
+
+    <select id="listMajor" parameterType="com.zhongzheng.modules.course.bo.MajorLabelQueryBo"  resultMap="MajorLabelVoResult">
+        SELECT
+        l.*,
+        m.category_name,
+        m.id as major_id
+        FROM
+        major_label l
+        LEFT JOIN major m ON l.id = m.label_id
+        WHERE
+        1 = 1
+        AND l.id =1
+        <if test="status != null and status.size()!=0 ">
+            AND l.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="encoder != null and encoder != ''">
+            AND l.encoder = #{encoder}
+        </if>
+        <if test="labelName != null and labelName != ''">
+            AND l.label_name = #{labelName}
+        </if>
+        <if test="id != null and id != ''">
+            AND l.id = #{id}
+        </if>
+
+    </select>
 </mapper>