diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java index aaed0d7..c72a4b0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java @@ -87,13 +87,13 @@ * 权属单位(下拉框) */ @TableField("deptid") - @ExcelProperty("权属单位代码") private Long deptid; /** * 权属单位(下拉框) */ @TableField(exist = false) + @ExcelProperty("权属单位") private String deptName; /** * 起始地面高(mm) diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java index aaed0d7..c72a4b0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/BusPipeline.java @@ -87,13 +87,13 @@ * 权属单位(下拉框) */ @TableField("deptid") - @ExcelProperty("权属单位代码") private Long deptid; /** * 权属单位(下拉框) */ @TableField(exist = false) + @ExcelProperty("权属单位") private String deptName; /** * 起始地面高(mm) diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java index 8a045af..8612529 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java @@ -9,14 +9,12 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.constant.BusWellConst; import com.casic.missiles.modular.system.dao.BusPipelineMapper; -import com.casic.missiles.modular.system.dto.BatchExportDataDto; import com.casic.missiles.modular.system.dto.BatchExportPipelineDto; import com.casic.missiles.modular.system.model.BusPipeline; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.IBusPipelineService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.omg.CORBA.OBJ_ADAPTER; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.BeanPropertyBindingResult; @@ -74,8 +72,8 @@ pipelineTypeMap.put(dict.getName(), dict.getCode()); }); List> deptList = this.baseMapper.getDeptMap();//部门名称 - Map deptMap = deptList.stream().collect( - Collectors.toMap(e->(Long)e.get("id"),e->e.get("simpleName")) + Map deptMap = deptList.stream().collect( + Collectors.toMap(e -> (String) e.get("simpleName"), e -> (Long) e.get("id")) ); final Integer[] index = {0}; for (BusPipeline busPipeline : results) { @@ -97,11 +95,17 @@ if (pipelineTypeMap.containsKey(busPipeline.getPipelineType())) { busPipeline.setPipelineType(pipelineTypeMap.get(busPipeline.getPipelineType())); } else { - list.add("第" + index[0] + "行,井类型不存在!"); + list.add("第" + index[0] + "行,管线类型不存在!"); break; } - if (deptMap.containsKey(busPipeline.getDeptid())) { - list.add("第" + index[0] + "行,权属单位代码不存在!"); + if (StrUtil.isEmpty(busPipeline.getDeptName())) { + list.add("第" + index[0] + "行,权属单位不能为空!"); + break; + } + if (deptMap.containsKey(busPipeline.getDeptName())) { + busPipeline.setDeptid(deptMap.get(busPipeline.getDeptName())); + } else { + list.add("第" + index[0] + "行,权属单位不存在!"); break; } //其他相关性校验