导入相关调整

zhongrj

2025-01-04 7b0046c605e3accdcf8fb5987e8690b29927c41b

导入相关调整

 src/main/java/org/springblade/modules/yw/excel/EmergencySpaceExcel.java

@@ -22,7 +22,7 @@
    private static final long serialVersionUID = 1L;

    @ColumnWidth(20)
    @ExcelProperty("应急空间名称")
    @ExcelProperty("应急空间名称*")
    private String name;

    @ColumnWidth(20)

 src/main/java/org/springblade/modules/yw/service/impl/EmergencySpaceServiceImpl.java

@@ -127,6 +127,7 @@
        FirmInfo firmInfo = firmInfoService.getOne(wrapper);
        if (null!=firmInfo){
            emergencySpaceEntity.setFirmId(firmInfo.getId());
            emergencySpaceEntity.setFullName(firmInfo.getName() + emergencySpaceExcel.getName());
        }
    }


 src/main/java/org/springblade/modules/yw/service/impl/EmergencySuppliesServiceImpl.java

@@ -76,16 +76,16 @@
            setFirm(emergencySuppliesExcel,emergencySuppliesEntity);
            setSupplies(emergencySuppliesExcel,emergencySuppliesEntity);
            // 查询是否已入库
            Long id = isSave(emergencySuppliesEntity);
//            Long id = isSave(emergencySuppliesEntity);
            // 已入库
            if (null!=id){
                if (isCovered){
                    emergencySuppliesEntity.setId(id);
                    // 覆盖-更新
                    updateById(emergencySuppliesEntity);
                    continue;
                }
            }
//            if (null!=id){
//                if (isCovered){
//                    emergencySuppliesEntity.setId(id);
//                     覆盖-更新
//                    updateById(emergencySuppliesEntity);
//                    continue;
//                }
//            }
            // 保存
            save(emergencySuppliesEntity);
        }
@@ -134,7 +134,10 @@
        QueryWrapper<SuppliesEntity> wrapper = new QueryWrapper<>();
        wrapper.eq("name",emergencySuppliesExcel.getSuppliesName())
            .eq("is_deleted",0);
        if (!emergencySuppliesExcel.getSuppliesName().contains("园区")){
        if (!emergencySuppliesExcel.getSuppliesName().contains("园区")
            && !emergencySuppliesExcel.getSuppliesName().contains("码头工业城")
            && !emergencySuppliesExcel.getSuppliesName().contains("环境局")
        ){
            wrapper.eq("firm_id",emergencySuppliesEntity.getFirmId());
        }
        SuppliesEntity suppliesEntity = suppliesService.getOne(wrapper);

 src/main/java/org/springblade/modules/yw/service/impl/RescueTeamServiceImpl.java

@@ -65,15 +65,15 @@
                }
            }
            // 判断是否保存
            Long id = isSave(rescueTeamExcel);
            if (null!=id){
                if (isCovered){
                    // 覆盖更新
                    rescueTeamEntity.setId(id);
                    updateById(rescueTeamEntity);
                    continue;
                }
            }
//            Long id = isSave(rescueTeamExcel);
//            if (null!=id){
//                if (isCovered){
//                    // 覆盖更新
//                    rescueTeamEntity.setId(id);
//                    updateById(rescueTeamEntity);
//                    continue;
//                }
//            }
            // 保存
            save(rescueTeamEntity);
        }