From af72c5015011836fbdd4eeb30ce82c9ae8c4b794 Mon Sep 17 00:00:00 2001 From: sunxiqing <2240398334@qq.com> Date: Mon, 11 Aug 2025 11:21:56 +0800 Subject: [PATCH] =?UTF-8?q?refactor(yudao-module-llm):=20=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AF=BC=E5=87=BA=20Excel?= =?UTF-8?q?=20=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改表格列标题，增加 "system" 列，调整 "question" 和 "answer" 列的位置 - 更新单元格合并逻辑，确保 "system" 列和 "question" 列正确合并 - 优化代码结构，提高可读性和可维护性 --- .../dataset/DatasetQuestionController.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/DatasetQuestionController.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/DatasetQuestionController.java index 9f4409a6a..fa585ce3b 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/DatasetQuestionController.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/dataset/DatasetQuestionController.java @@ -80,33 +80,40 @@ public class DatasetQuestionController { int count = 0; List id = new ArrayList<>(); HSSFRow row = sheet.createRow(count); - row.createCell(0).setCellValue("问题内容"); + row.createCell(0).setCellValue("system"); row.getCell(0).setCellStyle(cellStyle); - row.createCell(1).setCellValue("标注内容"); + row.createCell(1).setCellValue("question"); row.getCell(1).setCellStyle(cellStyle); + row.createCell(2).setCellValue("answer"); + row.getCell(2).setCellStyle(cellStyle); id.add(count); count++; pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = datasetQuestionService.getDatasetQuestionPage(pageReqVO).getList(); for (DatasetQuestionRespVO item : list){ + String system = item.getSystem(); String question = item.getQuestion(); List datasetAnswerRespVO = item.getDatasetAnswerRespVO(); List collect = datasetAnswerRespVO.stream().map(DatasetAnswerRespVO::getAnswer).collect(Collectors.toList()); if (collect.size() == 0){ row = sheet.createRow(count); - row.createCell(0).setCellValue(question); + row.createCell(0).setCellValue(system); row.getCell(0).setCellStyle(cellStyle); - row.createCell(1).setCellValue(""); + row.createCell(1).setCellValue(question); row.getCell(1).setCellStyle(cellStyle); + row.createCell(2).setCellValue(""); + row.getCell(2).setCellStyle(cellStyle); id.add(count); count++; }else { for (String s : collect) { row = sheet.createRow(count); - row.createCell(0).setCellValue(question); + row.createCell(0).setCellValue(system); row.getCell(0).setCellStyle(cellStyle); - row.createCell(1).setCellValue(s); + row.createCell(1).setCellValue(question); row.getCell(1).setCellStyle(cellStyle); + row.createCell(2).setCellValue(s); + row.getCell(2).setCellStyle(cellStyle); count++; } id.add(count-1); @@ -115,7 +122,7 @@ public class DatasetQuestionController { //合并相同内容的单元格 for (int i = 0; i < id.size() - 1; i++){ if (id.get(i+1)-id.get(i)>1) { - sheet.addMergedRegion(new CellRangeAddress(id.get(i)+1, id.get(i + 1), 0, 0)); + sheet.addMergedRegion(new CellRangeAddress(id.get(i)+1, id.get(i + 1), 0, 1)); } } // 导出 Excel