feat：标签新增、下拉增加部门id

龚焕茏

2024-07-09 c5c10c1bb95f5bb7fdc8b714c5c998e78c26e0f7

 src/main/java/com/mindskip/xzs/service/impl/SubjectServiceImpl.java

@@ -1,6 +1,14 @@
package com.mindskip.xzs.service.impl;

import com.mindskip.xzs.context.WebContext;
import com.mindskip.xzs.domain.Subject;
import com.mindskip.xzs.domain.SubjectDept;
import com.mindskip.xzs.domain.enums.RoleEnum;
import com.mindskip.xzs.domain.form.AddSubjectForm;
import com.mindskip.xzs.domain.form.EditSubjectForm;
import com.mindskip.xzs.repository.BaseMapper;
import com.mindskip.xzs.repository.DepartmentMapper;
import com.mindskip.xzs.repository.SubjectDeptMapper;
import com.mindskip.xzs.repository.SubjectMapper;
import com.mindskip.xzs.service.SubjectService;
import com.mindskip.xzs.viewmodel.admin.education.SubjectPageRequestVM;
@@ -8,18 +16,26 @@
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

@Service
public class SubjectServiceImpl extends BaseServiceImpl<Subject> implements SubjectService {

    private final SubjectMapper subjectMapper;
    private final WebContext webContext;
    private final DepartmentMapper departmentMapper;
    private final SubjectDeptMapper subjectDeptMapper;

    @Autowired
    public SubjectServiceImpl(SubjectMapper subjectMapper) {
        super(subjectMapper);
    public SubjectServiceImpl(BaseMapper<Subject> baseMapper, SubjectMapper subjectMapper, WebContext webContext, DepartmentMapper departmentMapper, SubjectDeptMapper subjectDeptMapper) {
        super(baseMapper);
        this.subjectMapper = subjectMapper;
        this.webContext = webContext;
        this.departmentMapper = departmentMapper;
        this.subjectDeptMapper = subjectDeptMapper;
    }

    @Override
@@ -39,7 +55,10 @@

    @Override
    public List<Subject> allSubject() {
        return subjectMapper.allSubject();
        // 只查自己部门的课目
        List<Integer> deptIds = webContext.getAdminDeptIds();
        Boolean admin = RoleEnum.ADMIN.getCode().equals(webContext.getCurrentUser().getRole());
        return subjectMapper.allSubject(deptIds, admin);
    }

    @Override
@@ -64,4 +83,38 @@
        return subjectMapper.selectByIds(ids);
    }

    @Override
    public List<Subject> listByDeptId(Integer deptId) {
        return subjectMapper.listByDeptId(deptId);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void add(AddSubjectForm form) {
        Subject subject = new Subject();
        subject.setName(form.getSubjectName());
        subject.setDeleted(false);
        subjectMapper.insert(subject);

        SubjectDept subjectDept = new SubjectDept();
        subjectDept.setDeptId(form.getDeptId());
        subjectDept.setSubjectId(subject.getId());
        List<SubjectDept> s = new ArrayList<>(1);
        s.add(subjectDept);
        subjectDeptMapper.add(s);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void edit(EditSubjectForm form) {
        // 删除原先的课目，再新增
        subjectDeptMapper.deleteByDeptId(form.getDeptId());
        List<SubjectDept> toAddList = form.getSubjectIds().stream().map(subjectId -> {
            SubjectDept subjectDept = new SubjectDept();
            subjectDept.setDeptId(form.getDeptId());
            subjectDept.setSubjectId(subjectId);
            return subjectDept;
        }).collect(Collectors.toList());
        subjectDeptMapper.add(toAddList);
    }
}