feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/cal/team/MesCalTeamServiceImpl.java

@@ -2,8 +2,11 @@

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.cal.team.vo.MesCalTeamSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.cal.team.MesCalTeamDO;
@@ -14,9 +17,12 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;

import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -119,4 +125,54 @@
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public MesCalTeamImportRespVO importTeamList(List<MesCalTeamImportExcelVO> importList,
                                                 boolean updateSupport) {
        // 1. 校验非空
        if (CollUtil.isEmpty(importList)) {
            throw exception(CAL_TEAM_IMPORT_LIST_IS_EMPTY);
        }

        // 2. 逐行处理
        MesCalTeamImportRespVO respVO = MesCalTeamImportRespVO.builder()
                .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
                .failureCodes(new LinkedHashMap<>()).build();
        AtomicInteger index = new AtomicInteger(1);
        importList.forEach(importItem -> {
            int currentIndex = index.getAndIncrement();
            String key = StrUtil.blankToDefault(importItem.getCode(), "第 " + currentIndex + " 行");
            if (StrUtil.isBlank(importItem.getCode())) {
                respVO.getFailureCodes().put(key, "班组编码不能为空");
                return;
            }
            if (StrUtil.isBlank(importItem.getName())) {
                respVO.getFailureCodes().put(key, "班组名称不能为空");
                return;
            }
            if (importItem.getCalendarType() == null) {
                respVO.getFailureCodes().put(key, "班组类型不能为空");
                return;
            }
            // 2.1 判断：创建 or 更新
            MesCalTeamDO existTeam = teamMapper.selectByCode(importItem.getCode());
            if (existTeam == null) {
                // 2.1.1 新增
                MesCalTeamDO team = BeanUtils.toBean(importItem, MesCalTeamDO.class);
                team.setId(null);
                teamMapper.insert(team);
                respVO.getCreateCodes().add(importItem.getCode());
            } else if (updateSupport) {
                // 2.1.2 更新
                MesCalTeamDO updateObj = BeanUtils.toBean(importItem, MesCalTeamDO.class);
                updateObj.setId(existTeam.getId());
                teamMapper.updateById(updateObj);
                respVO.getUpdateCodes().add(importItem.getCode());
            } else {
                respVO.getFailureCodes().put(key, "班组编码已存在");
            }
        });
        return respVO;
    }

}