调压箱导入问题

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GPressureRegulatingBoxServiceImpl.java

@@ -57,26 +57,22 @@ public class GPressureRegulatingBoxServiceImpl extends ServicePlusImpl<GPressure
                 if (StringUtils.isNotEmpty(vo.getNumber())) {
                     successNum++;
                     GPressureRegulatingBox gPressureRegulatingBox = baseMapper.getByNumber(vo.getNumber(),vo.getName(),vo.getManagementOffice());
-                    String type = sysDictDataMapper.queryValueTextByKey("tyx_type", vo.getType());
+                    String type = sysDictDataMapper.queryDictTextByKey("tyx_type", vo.getType());
                     if (StringUtils.isBlank(type)) {
                         throw new ServiceException( "第" + (n + 1) + "行类型填写错误,导入失败!");
                     }
-                    String getNature = sysDictDataMapper.queryValueTextByKey("tyx_nature", vo.getNature());
+                    String getNature = sysDictDataMapper.queryDictTextByKey("tyx_nature", vo.getNature());
                     if (StringUtils.isBlank(getNature)) {
                         throw new ServiceException("第" + (n + 1) + "行性质填写错误,导入失败!");
                     }
-                    String getNumberOfRoutes = sysDictDataMapper.queryValueTextByKey("tyx_numberOfRoutes", vo.getNumberOfRoutes());
+                    String getNumberOfRoutes = sysDictDataMapper.queryDictTextByKey("tyx_numberOfRoutes", vo.getNumberOfRoutes());
                     if (StringUtils.isBlank(getNumberOfRoutes)) {
                         throw new ServiceException( "第" + (n + 1) + "行路数填写错误,导入失败!");
                     }
-                    String getManagementOffice = sysDictDataMapper.queryValueTextByKey("administrative_office", vo.getManagementOffice());
+                    String getManagementOffice = sysDictDataMapper.queryDictTextByKey("administrative_office", vo.getManagementOffice());
                     if (StringUtils.isBlank(getManagementOffice)) {
                         throw new ServiceException( "第" + (n + 1) + "行管理所填写错误,导入失败!");
                     }
-                    vo.setNature(getNature);
-                    vo.setType(type);
-                    vo.setNumberOfRoutes(getNumberOfRoutes);
-                    vo.setManagementOffice(getManagementOffice);
                     if (ObjectUtils.isEmpty(gPressureRegulatingBox)) {
                         GPressureRegulatingBox bean = BeanUtil.toBean(vo, GPressureRegulatingBox.class);
                         bean.setId(null);