diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java index 5fb1214a..713ad309 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.quality.controller; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -80,8 +81,7 @@ public class CycleTestItemController extends BladeController { @ApiOperationSupport(order = 2) @Operation(summary = "list分页", description = "传入cycleTestItem") public R> list( - @Parameter(hidden = true) @RequestParam Map cycleTestItem, - Query query) { + @Parameter(hidden = true) @RequestParam Map cycleTestItem, Query query) { return service2.list(cycleTestItem, query); } @@ -151,9 +151,11 @@ public class CycleTestItemController extends BladeController { // queryWrapper.lambda().eq(CycleTestItem::getTenantId, bladeUser.getTenantId()); //} //queryWrapper.lambda().eq(CycleTestItemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportCycleTestItem(queryWrapper); + + List listVO = service2.listWithoutPage(cycleTestItem); + List listExcel = BeanUtil.copyToList(listVO, CycleTestItemExcel.class); ExcelUtil.export(response, "[周期试验项目]数据" + DateUtil.time(), - "[周期试验项目]数据表", list, + "[周期试验项目]数据表", listExcel, CycleTestItemExcel.class); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/CycleTestItemExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/CycleTestItemExcel.java index 13dfafd8..31a45b79 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/CycleTestItemExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/CycleTestItemExcel.java @@ -45,6 +45,6 @@ public class CycleTestItemExcel implements Serializable { * 试验标准 */ @ColumnWidth(20) - @ExcelProperty("试验标准") - private String standard; + @ExcelProperty("执行标准") + private String cycleTestStandardName; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestItemMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestItemMapper.xml index 8999cb92..5d837c36 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestItemMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestItemMapper.xml @@ -18,7 +18,7 @@