代码修改

无关风月

2025-01-01 ca070436770f715572405880cfe548c02f639c73

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

@@ -61,17 +61,16 @@
    @ApiOperation(value = "树状图",tags = "web-下拉框")
    @PostMapping(value = "/tree")
    public R<List<TTechnicalTitle>> tree(){
        List<TLevel> list2 = levelService.list();

        List<TTitleMajor> tTitleMajorList = majorService.lambdaQuery().list();
        List<TTechnicalTitle> list = tTechnicalTitleService.list();
        for (TTechnicalTitle tTechnicalTitle : list) {
            tTechnicalTitle.setName(tTechnicalTitle.getTitileName());
            List<TTitleMajor> list1 = majorService.lambdaQuery().eq(TTitleMajor::getTechnicalId, tTechnicalTitle.getId()).list();
            for (TTitleMajor tTitleMajor : list1) {
            List<TTitleMajor> tTitleMajors = tTitleMajorList.stream().filter(e -> e.getTechnicalId().equals(tTechnicalTitle.getId())).collect(Collectors.toList());
            for (TTitleMajor tTitleMajor : tTitleMajors) {
                tTitleMajor.setName(tTitleMajor.getMajorName());
//                tTitleMajor.setMajors(list2);
            }
            tTechnicalTitle.setMajors(list1);
            tTechnicalTitle.setMajors(tTitleMajors);
        }
        return R.ok(list);
    }
@@ -110,36 +109,36 @@
        List<String> list = Arrays.asList(ids.split(","));
        for (String s : list) {
            //判断是否有关联数据
            Long count = userChangeDetailService.lambdaQuery().eq(TUserChangeDetail::getTitleId, s).count();
            if (count>0){
            Long userChange = userChangeDetailService.lambdaQuery().eq(TUserChangeDetail::getTitleId, s).count();
            if (userChange>0){
                return R.fail("当前职称已有用户设为偏好，无法删除");
            }
            Long count1 = consultationService.lambdaQuery().eq(TConsultation::getTitleId, s).count();
            if (count1>0){
            Long consultation = consultationService.lambdaQuery().eq(TConsultation::getTitleId, s).count();
            if (consultation>0){
                return R.fail("当前职称已设置咨询，无法删除");
            }
            Long count2 = declareNoticeService.lambdaQuery().eq(TDeclareNotice::getTechnicalId, s).count();
            if (count2>0){
            Long declareNotice = declareNoticeService.lambdaQuery().eq(TDeclareNotice::getTechnicalId, s).count();
            if (declareNotice>0){
                return R.fail("当前职称已设置申报通知，无法删除");
            }
            Long count3 = committeeTechnicalService.lambdaQuery().eq(TCommitteeTechnical::getTechnicalId, s).count();
            if (count3>0){
            Long committeeTechnical = committeeTechnicalService.lambdaQuery().eq(TCommitteeTechnical::getTechnicalId, s).count();
            if (committeeTechnical>0){
                return R.fail("当前职称已设置委员会可评审职称，无法删除");
            }
            Long count4 = committeeService.lambdaQuery().eq(TCommittee::getTechnicalId, s).count();
            if (count4>0){
            Long committee = committeeService.lambdaQuery().eq(TCommittee::getTechnicalId, s).count();
            if (committee>0){
                return R.fail("当前职称已设置评审委员会，无法删除");
            }
            Long count5 = informationService.lambdaQuery().eq(TInformation::getTechnicalId, s).count();
            if (count5>0){
            Long infomation = informationService.lambdaQuery().eq(TInformation::getTechnicalId, s).count();
            if (infomation>0){
                return R.fail("当前职称已设置资料，无法删除");
            }
            Long count6 = majorService.lambdaQuery().eq(TTitleMajor::getTechnicalId, s).count();
            if (count6>0){
            Long major = majorService.lambdaQuery().eq(TTitleMajor::getTechnicalId, s).count();
            if (major>0){
                return R.fail("当前职称已设置专业，无法删除");
            }
            Long count7 = courseService.lambdaQuery().eq(TCourse::getTechnicalId, s).count();
            if (count7>0){
            Long course = courseService.lambdaQuery().eq(TCourse::getTechnicalId, s).count();
            if (course>0){
                return R.fail("当前职称已设置课程，无法删除");
            }
        }
@@ -160,22 +159,17 @@
    @PostMapping("/export")
    public R export (@RequestParam("file") MultipartFile file) {
        List<TTechnicalTitle> tTechnicalTitles = new ArrayList<>();



        int errorLines = 0;
        int successLines = 0;
        ImportParams params = new ImportParams();
//        params.setTitleRows(1);//标题行数
        params.setHeadRows(1); //表头行数
        String msg = null;
        InputStream inputStream = null;

        List<String> failMsg = new ArrayList<>();

        try {
            inputStream = file.getInputStream();
            List<TechImportExcel> techImportExcels = ExcelImportUtil.importExcel(inputStream, TechImportExcel.class, params);
            List<TRegion> list = regionService.lambdaQuery().list();

            for (TechImportExcel techImportExcel : techImportExcels) {

                List<Integer> regionIds;
@@ -185,13 +179,13 @@
                    continue;
                } else {
                    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();
                            TRegion region = list.stream().filter(e -> e.getName().contains(s)).findFirst().orElse(null);
//                            TRegion region = regionService.lambdaQuery().like(TRegion::getName, s).one();
                            if (region == null) {
                                msg = "第" + techImportExcels.indexOf(techImportExcel) + "行,地区不存在";
                                failMsg.add(msg);