修改

xuhy

2024-12-13 381bd9f6a9525b11d574b4a4f79925d99d3ad626

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java

@@ -22,6 +22,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
import java.util.stream.Collectors;

/**
 * <p>
@@ -68,7 +69,7 @@
            List<TTitleMajor> list1 = majorService.lambdaQuery().eq(TTitleMajor::getTechnicalId, tTechnicalTitle.getId()).list();
            for (TTitleMajor tTitleMajor : list1) {
                tTitleMajor.setName(tTitleMajor.getMajorName());
                tTitleMajor.setMajors(list2);
//                tTitleMajor.setMajors(list2);
            }
            tTechnicalTitle.setMajors(list1);
        }
@@ -82,6 +83,9 @@
    @PostMapping(value = "/edit")
    public R edit(@RequestBody TTechnicalTitle tTechnicalTitle){
        tTechnicalTitleService.updateById(tTechnicalTitle);

        // 修改专业的地区
        majorService.lambdaUpdate().eq(TTitleMajor::getTechnicalId, tTechnicalTitle.getId()).set(TTitleMajor::getRegionIds, tTechnicalTitle.getRegionIds()).update();
        return R.ok();
    }

@@ -180,21 +184,25 @@
                    failMsg.add(msg);
                    continue;
                } else {
                    String[] split = techImportExcel.getAddress().split(";");
                    regionIds = new ArrayList<>();
                    for (String s : split) {
                        TRegion region = regionService.lambdaQuery().like(TRegion::getName, s).one();
                        if (region == null) {
                            msg = "第" + techImportExcels.indexOf(techImportExcel) + "行,地区不存在";
                            failMsg.add(msg);
                        } else {
                            regionIds.add(region.getId());
                    if("全部".equals(techImportExcel.getAddress())){
                        List<TRegion> list = regionService.lambdaQuery().list();
                        regionIds = list.stream().map(TRegion::getId).collect(Collectors.toList());
                    }else {
                        String[] split = techImportExcel.getAddress().split(";");
                        regionIds = new ArrayList<>();
                        for (String s : split) {
                            TRegion region = regionService.lambdaQuery().like(TRegion::getName, s).one();
                            if (region == null) {
                                msg = "第" + techImportExcels.indexOf(techImportExcel) + "行,地区不存在";
                                failMsg.add(msg);
                            } else {
                                regionIds.add(region.getId());
                            }
                        }
                        if (regionIds.size() != split.length) {
                            continue;
                        }
                    }
                    if (regionIds.size() != split.length) {
                        continue;
                    }

                }
                TTechnicalTitle tTechnicalTitle = new TTechnicalTitle();
                tTechnicalTitle.setTitileName(techImportExcel.getTitileName());
@@ -212,7 +220,7 @@
            e.printStackTrace();
//            logger.error("批量购入导入失败:{}",e.getMessage());
//            importRecordService.removeById(tImportRecord.getId());
            return R.fail("批量购入导入失败!");
            return R.fail("批量导入失败!");
        }finally {
            try {
                inputStream.close();