导入质检划分树 编号和名称交换位置

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -3783,7 +3783,7 @@ public class ExcelTabController extends BladeController {
     @ApiImplicitParam(name = "fileId", value = "fileId")
     public void downGongChengExcelFile(HttpServletResponse response) throws Exception {
         String fileName = URLEncoder.encode("工程划分导入模版", Charsets.UTF_8.name());
-        String filePath="https://xinan1.zos.ctyun.cn/blade-oss-chongqing/upload/20250508/bf69e3bd5a3fd3a216099238591948d9.xlsx";
+        String filePath="https://xinan1.zos.ctyun.cn/blade-oss-chongqing/upload/20250717/780f2392e0c15810de10cde98217ad36.xlsx";
         InputStream redio = CommonUtil.getOSSInputStream(filePath);
         byte[] buffer = IoUtil.readToByteArray(redio);
         OutputStream toClient = new BufferedOutputStream(response.getOutputStream());

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -2666,18 +2666,18 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             Row row = sheet.getRow(i);
             if (row == null) continue;
             // 获取每一列的值
-            String unitName = getCellValue(row.getCell(0)); // A列：单位工程名称
-            String unitCode = getCellValue(row.getCell(1)); // B列：单位工程编号
-            String subUnitName = getCellValue(row.getCell(2)); // C列：子单位工程名称
-            String subUnitCode = getCellValue(row.getCell(3)); // D列：子单位工程编号
-            String divisionName = getCellValue(row.getCell(4)); // E列：分部工程名称
-            String divisionCode = getCellValue(row.getCell(5)); // F列：分部工程编号
-            String subDivisionName = getCellValue(row.getCell(6)); // G列：子分部工程名称
-            String subDivisionCode = getCellValue(row.getCell(7)); // H列：子分部工程编号
-            String itemName = getCellValue(row.getCell(8)); // I列：分项工程名称
-            String itemCode = getCellValue(row.getCell(9)); // J列：分项工程编号
-            String subItemName = getCellValue(row.getCell(10)); // K列：子分项工程名称
-            String subItemCode = getCellValue(row.getCell(11));// L列：子分项工程编号
+            String unitCode = getCellValue(row.getCell(0)); // A列：单位工程编号
+            String unitName = getCellValue(row.getCell(1)); // B列：单位工程名称
+            String subUnitCode = getCellValue(row.getCell(2)); // C列：子单位工程编号
+            String subUnitName = getCellValue(row.getCell(3)); // D列：子单位工程名称
+            String divisionCode = getCellValue(row.getCell(4)); // E列：分部工程编号
+            String divisionName = getCellValue(row.getCell(5)); // F列：分部工程名称
+            String subDivisionCode = getCellValue(row.getCell(6)); // G列：子分部工程编号
+            String subDivisionName = getCellValue(row.getCell(7)); // H列：子分部工程名称
+            String itemCode = getCellValue(row.getCell(8)); // I列：分项工程编号
+            String itemName = getCellValue(row.getCell(9)); // J列：分项工程名称
+            String subItemCode = getCellValue(row.getCell(10));// K列：子分项工程编号
+            String subItemName = getCellValue(row.getCell(11)); // L列：子分项工程名称
             ImportTreeDto dto=new ImportTreeDto(unitName,unitCode,1,StringUtils.isEmpty(unitName) ,subUnitName,subUnitCode,18,StringUtils.isEmpty(subUnitName),divisionName,divisionCode,2,StringUtils.isEmpty(divisionName), subDivisionName,subDivisionCode,3,StringUtils.isEmpty(subDivisionName),itemName,itemCode,4,StringUtils.isEmpty(itemName),subItemName,subItemCode,5,StringUtils.isEmpty(subItemName));
                 list.add(dto);
         }