diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java index 93ed4e8..080b291 100644 --- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java +++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java @@ -461,15 +461,20 @@ } for (int i = 1; i < rows; i++) { MarkerDto markerDto = new MarkerDto(); + if (recordTypeFlag == 1) { + markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents()); + markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents()); + markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents()); + } else if(recordTypeFlag == 4) { + markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents()); + markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents()); + markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents()); + markerDto.setBelowDepth(sheet.getCell(indexMap.get("belowDepth"), i).getContents()); + markerDto.setBelowDiameter(sheet.getCell(indexMap.get("belowDiameter"), i).getContents()); + markerDto.setBelowMaterial(sheet.getCell(indexMap.get("belowMaterial"), i).getContents()); + } markerDto.setMarkerObjectType(sheet.getCell(indexMap.get("markerObjectType"), i).getContents()); - markerDto.setPipeMaterial(sheet.getCell(indexMap.get("pipeMaterial"), i).getContents()); - markerDto.setPipeDiameter(sheet.getCell(indexMap.get("pipeDiameter"), i).getContents()); - markerDto.setLayStyle(sheet.getCell(indexMap.get("layStyle"), i).getContents()); markerDto.setDepth(sheet.getCell(indexMap.get("depth"), i).getContents()); - markerDto.setBelowType(sheet.getCell(indexMap.get("belowType"), i).getContents()); - markerDto.setBelowDepth(sheet.getCell(indexMap.get("belowDepth"), i).getContents()); - markerDto.setBelowDiameter(sheet.getCell(indexMap.get("belowDiameter"), i).getContents()); - markerDto.setBelowMaterial(sheet.getCell(indexMap.get("belowMaterial"), i).getContents()); markerDto.setRoad(sheet.getCell(indexMap.get("road"), i).getContents()); markerDto.setConstructTime(sheet.getCell(indexMap.get("constructTime"), i).getContents()); markerDto.setOwnerComp(sheet.getCell(indexMap.get("ownerComp"), i).getContents());