新功能加问题修复

heheng

昨天 a8a6760635f0642a2cbf61854b5587d9d0944985

 multi-system/src/main/java/com/gkhy/exam/system/service/impl/SysDeptServiceImpl.java

@@ -2,35 +2,36 @@


import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.gkhy.exam.common.constant.Constants;
import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.constant.UserConstant;
import com.gkhy.exam.common.domain.TreeSelect;
import com.gkhy.exam.common.domain.entity.SysDept;
import com.gkhy.exam.common.domain.entity.SysRole;
import com.gkhy.exam.common.domain.entity.SysUser;
import com.gkhy.exam.common.exception.ApiException;
import com.gkhy.exam.common.utils.NaturalOrderComparator;
import com.gkhy.exam.common.utils.PageUtils;
import com.gkhy.exam.common.utils.SecurityUtils;
import com.gkhy.exam.common.utils.SpringUtils;
import com.gkhy.exam.system.domain.ExPaperStudent;
import com.gkhy.exam.system.domain.SysDeptManage;
import com.gkhy.exam.system.domain.SysDeptResponsibility;
import com.gkhy.exam.system.domain.SysFunctionalDistribution;
import com.gkhy.exam.system.domain.SysFunctionalRemark;
import com.gkhy.exam.system.domain.req.SysDeptPageReq;
import com.gkhy.exam.system.domain.vo.*;
import com.gkhy.exam.system.mapper.SysDeptMapper;
import com.gkhy.exam.system.mapper.SysDeptResponsibilityMapper;
import com.gkhy.exam.system.mapper.SysFunctionalDistributionMapper;
import com.gkhy.exam.system.mapper.SysRoleMapper;
import com.gkhy.exam.system.mapper.*;
import com.gkhy.exam.system.service.ISysDeptService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;

/**
@@ -52,8 +53,36 @@

    @Autowired
    private SysFunctionalDistributionMapper sysFunctionalDistributionMapper;

    @Autowired
    private SysFunctionalRemarkMapper sysFunctionalRemarkMapper;

    public static final String[] DEPT_ROOT = {"4.1",  "4.2", "4.3", "4.4", "5.1", "5.2", "5.3","6.1", "6.2", "6.3",
            "7.1.1",  "7.1.2", "7.1.3", "7.1.4", "7.1.5", "7.1.6"};
            "7.1.1",  "7.1.2", "7.1.3", "7.1.4", "7.1.5", "7.1.6","7.2", "7.3", "7.4", "7.5", "7.6","8.1","8.2","8.2.1","8.2.2", "8.2.3", "8.2.4", "8.3", "8.3.1", "8.3.2", "8.3.3", "8.3.4", "8.3.5", "8.3.6", "8.3.7", "8.3.8", "8.4",
    "8.4.1", "8.4.2", "8.4.3", "8.5", "8.5.1", "8.5.2", "8.5.3", "8.5.4", "8.5.5", "8.5.6", "8.5.7", "8.6","8.7","9.1","9.1.1","9.1.2","9.1.3","9.2", "9.3","10.1"
            ,"10.2", "10.3"};

    @Override
    public CommonPage selectDeptPageList(SysDeptPageReq req) {

        PageUtils.startPage();

        List<DeptVo> deptVos = deptMapper.selectDeptPageList(req);
        if (ObjectUtil.isNotEmpty(deptVos)){
            for (DeptVo deptVo : deptVos) {
                List<CaluseVO1> caluseVO1List = deptVo.getCaluseVO1List();
                if (ObjectUtil.isNotEmpty(caluseVO1List)){
                    caluseVO1List.sort(Comparator.comparing(CaluseVO1::getClauseNum, new NaturalOrderComparator()));
                }

            }
        }

        CommonPage<DeptVo> deptVoCommonPage = CommonPage.restPage(deptVos);
        return deptVoCommonPage;

    }

    /**
     * 查询部门管理数据
     * 
@@ -64,7 +93,20 @@

    public List<DeptVo> selectDeptList(SysDept dept)
    {
        return deptMapper.selectDeptList(dept);
        if (dept.getCompanyId() == null){
            dept.setCompanyId(SecurityUtils.getCompanyId());
        }
        List<DeptVo> deptVos = deptMapper.selectDeptList(dept);
        if (ObjectUtil.isNotEmpty(deptVos)){
            for (DeptVo deptVo : deptVos) {
                List<CaluseVO1> caluseVO1List = deptVo.getCaluseVO1List();
                if (ObjectUtil.isNotEmpty(caluseVO1List)){
                    caluseVO1List.sort(Comparator.comparing(CaluseVO1::getClauseNum, new NaturalOrderComparator()));
                }

            }
        }
        return deptVos;
    }

    @Override
@@ -82,7 +124,13 @@
    public List<TreeSelect> selectDeptTreeList(SysDept dept)
    {
        List<SysDept> depts = SpringUtils.getAopProxy(this).getOutDeptList(dept);

        return buildDeptTreeSelect(depts);
    }

    @Override
    public List<SysDept> getParentInfo(Long deptId) {
        return deptMapper.getParentInfo(deptId);
    }

    /**
@@ -155,6 +203,9 @@
                .eq(SysDeptResponsibility::getDelFlag, UserConstant.ENABLE)
                .orderByAsc(SysDeptResponsibility::getClauseNum);
        List<SysDeptResponsibility> sysDeptResponsibilities = deptResponsibilityMapper.selectList(lambdaQueryWrapper);
        if (ObjectUtil.isNotEmpty(sysDeptResponsibilities)){
            sysDeptResponsibilities.sort(Comparator.comparing(SysDeptResponsibility::getClauseNum, new NaturalOrderComparator()));
        }
        deptDetialVo.setSysDeptResponsibilitys(sysDeptResponsibilities);

        return deptDetialVo ;
@@ -208,7 +259,7 @@
    public boolean checkDeptNameUnique(SysDept dept)
    {
        Long deptId = ObjectUtil.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
        Long companyId = SecurityUtils.getLoginUser().getUser().getCompanyId();
        Long companyId = SecurityUtils.getCompanyId();

        SysDept info = deptMapper.checkDeptNameUnique(companyId,dept.getDeptName(), dept.getParentId());
        if (ObjectUtil.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
@@ -226,7 +277,7 @@
    @Override
    public void checkDeptDataScope(Long deptId)
    {
        if (!SecurityUtils.isAdmin(SecurityUtils.getUserId()) && ObjectUtil.isNotNull(deptId))
        if (!SecurityUtils.adminUser() && ObjectUtil.isNotNull(deptId))
        {
            SysDept dept = new SysDept();
            dept.setDeptId(deptId);
@@ -258,23 +309,41 @@
    }

    @Override
    @Transactional(rollbackFor = RuntimeException.class)
    public int saveDept(SysDeptSaveDTOReq dept) {
        Long companyId = SecurityUtils.getLoginUser().getUser().getCompanyId();
        if (!companyId.equals(dept.getCompanyId())){
            throw new ApiException("无权操作！");
        }
//        Long companyId = SecurityUtils.getCompanyId();
//        if (!companyId.equals(dept.getCompanyId())){
//            throw new ApiException("无权操作！");
//        }
        SysDept sysDept = new SysDept();
        BeanUtils.copyProperties(dept, sysDept);
        sysDept.setCompanyId(companyId);
        boolean b = checkDeptNameUnique(sysDept);
        if (!b){
            throw new ApiException("部门名称已存在！");
        }
        SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());

        int i = 0;
        if (sysDept.getDeptId() == null){
            if (ObjectUtil.isNotNull(newParentDept)){
                String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
                dept.setAncestors(newAncestors);
            }
            sysDept.setCreateBy(SecurityUtils.getUsername());
             i = deptMapper.insertDept(sysDept);
        }else {
            if (sysDept.getParentId().equals(sysDept.getDeptId())){
                throw new ApiException("上级部门不能是自己！");
            }

            SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
            if (ObjectUtil.isNotNull(newParentDept) && ObjectUtil.isNotNull(oldDept))
            {
                String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
                String oldAncestors = oldDept.getAncestors();
                dept.setAncestors(newAncestors);
                updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
            }
            sysDept.setUpdateBy(SecurityUtils.getUsername());
            sysDept.setUpdateTime(LocalDateTime.now());
            i = deptMapper.updateDept(sysDept);
@@ -286,24 +355,42 @@
                delCaluse(sysDept.getDeptId(), delCaluseIds);
            }
            //处理条款
            batchSaveCaluse(sysDept.getDeptId(), companyId, dept.getCaluseVO1List());
            batchSaveCaluse(sysDept.getDeptId(), dept.getCompanyId(), dept.getCaluseVO1List());

        }

        return sysDept.getDeptId().byteValue();
    }

    @Override
    public int saveDeptResponsibility(SysDeptResponsibilityReqVo reqVo) {
        Long companyId = SecurityUtils.getLoginUser().getUser().getCompanyId();
        if (!companyId.equals(reqVo.getCompanyId())){
            throw new ApiException("无权操作！");
    private void bacthInsertManager(Long deptId, List<Long> managerIds,Long companyId) {
        deptMapper.deleteMangeBatch(deptId);
        if (managerIds != null && !managerIds.isEmpty())
        {
            List<SysDeptManage> sysDeptManagers = new ArrayList<>();
            for (Long managerId : managerIds)
            {
                SysDeptManage sysDeptManage = new SysDeptManage();
                sysDeptManage.setDeptId(deptId);
                sysDeptManage.setSubDeptId(managerId);
                sysDeptManage.setCompanyId(companyId);
                sysDeptManagers.add(sysDeptManage);
            }
            deptMapper.insetMangeBatch(sysDeptManagers);
        }
    }

    @Override
    @Transactional(rollbackFor = RuntimeException.class)
    public int saveDeptResponsibility(SysDeptResponsibilityReqVo reqVo) {
//        Long companyId = SecurityUtils.getCompanyId();
//        if (!companyId.equals(reqVo.getCompanyId())){
//            throw new ApiException("无权操作！");
//        }
        SysDept sysDept = deptMapper.selectDeptById(reqVo.getDeptId());
        if (null == sysDept){
            throw new ApiException("部门不存在！");
        }
        if (!companyId.equals(sysDept.getCompanyId())){
        if (!reqVo.getCompanyId().equals(sysDept.getCompanyId())){
            throw new ApiException("无权操作！");
        }
        SysDept dept = new SysDept();
@@ -324,23 +411,37 @@

    @Override
    public List<SysFunctionalDistribution> getFunctionalDistributionList(Long companyId) {

       return sysFunctionalDistributionMapper.selectListVo(companyId);
    }

    @Override
    @Transactional(rollbackFor = RuntimeException.class)
    public int initFunctionalDistribution(Long companyId) {

        if (!companyId.equals(SecurityUtils.getLoginUser().getUser().getCompanyId())){
            throw new ApiException("无权操作！");
        }
        sysFunctionalDistributionMapper.delete(new LambdaQueryWrapper<SysFunctionalDistribution>().eq(SysFunctionalDistribution::getCompanyId, SecurityUtils.getLoginUser().getUser().getCompanyId()));

        sysFunctionalDistributionMapper.delByCompanyId(companyId);
        sysFunctionalRemarkMapper.delByCompanyId(companyId);
        SysDept sysDept = new SysDept();
        sysDept.setCompanyId(companyId);
        sysDept.setResponsType("1");
        List<DeptVo> deptVos = deptMapper.selectDeptList(sysDept);
        if (deptVos != null && !deptVos.isEmpty()){
            List<SysFunctionalDistribution> sysFunctionalDistributions = new ArrayList<>();
            Map<String, CaluseVO1> clauseNumMap = new HashMap<>();
            Map<String, Integer> clauseNumSetNum = new HashMap<>();
            Set<String> clauseNumSet = new HashSet<>();
            for (DeptVo deptVo : deptVos) {
                List<CaluseVO1> caluseVO1List = deptVo.getCaluseVO1List();
                if (ObjectUtil.isNotEmpty(caluseVO1List)){
                // 转成 Map<String, CaluseVO1>，key 是 clauseNum
                    clauseNumMap = caluseVO1List.stream()
                            .collect(Collectors.toMap(
                                    CaluseVO1::getClauseNum, // key
                                    Function.identity(),     // value
                                    (existing, replacement) -> existing // 如果有重复 key，保留现有的值
                            ));
                }
                //加入职能
                for (String s : DEPT_ROOT) {
                    SysFunctionalDistribution sysFunctionalDistribution = new SysFunctionalDistribution();
                    sysFunctionalDistribution.setDeptId(deptVo.getDeptId());
@@ -348,12 +449,42 @@
                    sysFunctionalDistribution.setCreateBy(SecurityUtils.getUsername());
                    sysFunctionalDistribution.setCreateTime(LocalDateTime.now());
                    sysFunctionalDistribution.setClauseNum(s);
                    sysFunctionalDistribution.setChooseLab(0);
                    if (clauseNumMap.isEmpty()){
                        sysFunctionalDistribution.setChooseLab(0);
                    }else if (clauseNumMap.containsKey(s)){
                        sysFunctionalDistribution.setChooseLab(1);
                        if (deptVo.getDeptType().equals("0")){
                            Integer i = clauseNumSetNum.get(s);
                            if (i == null){
                                i = 0;
                                clauseNumSetNum.put(s, ++i);
                            }else {
                                clauseNumSetNum.put(s, ++i);
                                clauseNumSet.add(s);
                            }
                        }
                    }else {
                        sysFunctionalDistribution.setChooseLab(0);
                    }

                    sysFunctionalDistributions.add(sysFunctionalDistribution);
                }

            }
            int i = sysFunctionalDistributionMapper.batchInsert(sysFunctionalDistributions);
            if (clauseNumSet.size() > 0){
                List<SysFunctionalRemark> sysFunctionalRemarks = new ArrayList<>();
                for (String clauseNum : clauseNumSet) {
                    SysFunctionalRemark sysFunctionalRemark = new SysFunctionalRemark();
                    sysFunctionalRemark.setCompanyId(companyId);
                    sysFunctionalRemark.setClauseNum(clauseNum);
                    sysFunctionalRemark.setRemark(" ");
                    sysFunctionalRemark.setCreateBy(SecurityUtils.getUsername());
                    sysFunctionalRemark.setCreateTime(LocalDateTime.now());
                    sysFunctionalRemarks.add(sysFunctionalRemark);
                }
                int j = sysFunctionalRemarkMapper.batchInsert(sysFunctionalRemarks);
            }
            if (i < 1){
                throw new ApiException("初始化失败！");
            }
@@ -363,17 +494,43 @@
    }

    @Override
    @Transactional(rollbackFor = RuntimeException.class)
    public int saveFunctionalDistribution(FunctionalDistributionVo reqVo) {
        Long companyId = SecurityUtils.getLoginUser().getUser().getCompanyId();
        if (!companyId.equals(reqVo.getCompanyId())){
            throw new ApiException("无权操作！");
        }
//        Long companyId = SecurityUtils.getCompanyId();
//        if (!companyId.equals(reqVo.getCompanyId())){
//            throw new ApiException("无权操作！");
//        }
        List<SysFunctionalDistribution> list = reqVo.getList();
        int i = sysFunctionalDistributionMapper.batchUpdate(list);
        if (i < 1){
            throw new ApiException("保存失败！");
        if (list != null && !list.isEmpty())
        {
            list.forEach(e ->{
                e.setCompanyId(reqVo.getCompanyId());
                e.setUpdateBy(SecurityUtils.getUsername());
                e.setUpdateTime(LocalDateTime.now());
            });
            int i = sysFunctionalDistributionMapper.batchUpdate(list);
        }


        List<SysFunctionalRemark> remarks = reqVo.getRemarks();
        if (remarks != null && !remarks.isEmpty())
        {
            sysFunctionalRemarkMapper.delByCompanyId(reqVo.getCompanyId());

            remarks.forEach(e ->{
                e.setCompanyId(reqVo.getCompanyId());
                e.setCreateBy(SecurityUtils.getUsername());
                e.setCreateTime(LocalDateTime.now());
            });

            int i1 = sysFunctionalRemarkMapper.batchInsert(remarks);
        }
        return 1;
    }

    @Override
    public List<SysFunctionalRemark> getFunctionalRemarkList(Long companyId) {
        return sysFunctionalRemarkMapper.selectListVo(companyId);
    }


@@ -396,9 +553,16 @@
        if (emptyIdClauseNumSet.size() !=  emptyIdClauseNums.size()){
            throw new ApiException("部门条款编码重复！");
        }
        List<Long> emptyIdClauseIds = sysDeptResponsibilityList.stream()
                .filter(item -> item.getId() != null)
                .map(SysDeptResponsibility::getId)
                .collect(Collectors.toList());

        if (!emptyIdClauseNums.isEmpty()){
            List<SysDeptResponsibility> sysDeptResponsibilities = deptResponsibilityMapper.selectList(new LambdaQueryWrapper<SysDeptResponsibility>()
                    .eq(SysDeptResponsibility::getDeptId, reqVo.getDeptId()).in(SysDeptResponsibility::getClauseNum, emptyIdClauseNums));
                    .eq(SysDeptResponsibility::getDeptId, reqVo.getDeptId())
                    .in(SysDeptResponsibility::getClauseNum, emptyIdClauseNums)
                    .notIn(SysDeptResponsibility::getId, emptyIdClauseIds).eq(SysDeptResponsibility::getDelFlag, "0"));
            if (!sysDeptResponsibilities.isEmpty()){
                throw new ApiException("部门条款编码重复！");
            }
@@ -426,7 +590,7 @@
                .update(new SysDeptResponsibility(),
                        new LambdaUpdateWrapper<SysDeptResponsibility>().set(SysDeptResponsibility::getDelFlag, UserConstant.DEPT_DISABLE)
                                .set(SysDeptResponsibility::getUpdateTime, LocalDateTime.now()).set(SysDeptResponsibility::getUpdateBy, SecurityUtils.getUsername())
                                .eq(SysDeptResponsibility::getDeptId, deptId));
                                .eq(SysDeptResponsibility::getDeptId, deptId).in(SysDeptResponsibility::getId, delCaluseIds));
    }

    private void batchSaveCaluse(Long deptId,Long companyId, List<CaluseVO1> caluseVO1List) {
@@ -437,7 +601,8 @@
                .collect(Collectors.toList());
        if (!emptyIdClauseNums.isEmpty()){
            List<SysDeptResponsibility> sysDeptResponsibilities = deptResponsibilityMapper.selectList(new LambdaQueryWrapper<SysDeptResponsibility>()
                    .eq(SysDeptResponsibility::getDeptId, deptId).in(SysDeptResponsibility::getClauseNum, emptyIdClauseNums));
                    .eq(SysDeptResponsibility::getDeptId, deptId).in(SysDeptResponsibility::getClauseNum, emptyIdClauseNums)
                    .eq(SysDeptResponsibility::getCompanyId, companyId).eq(SysDeptResponsibility::getDelFlag, "0"));
            if (!sysDeptResponsibilities.isEmpty()){
                throw new ApiException("部门条款编码重复！");
            }
@@ -449,9 +614,11 @@
            sysDeptResponsibility.setCompanyId(companyId);
            sysDeptResponsibility.setDeptId(deptId);


            if (sysDeptResponsibility.getId() == null){
                sysDeptResponsibility.setCreateBy(SecurityUtils.getUsername());
                sysDeptResponsibility.setCreateTime(LocalDateTime.now());
                sysDeptResponsibility.setDataType("2");
                deptResponsibilityMapper.insert(sysDeptResponsibility);
            }else {
                sysDeptResponsibility.setUpdateBy(SecurityUtils.getUsername());