[周期试验项目] excel 导出。

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<IPage<CycleTestItemVO>> list(
-            @Parameter(hidden = true) @RequestParam Map<String, Object> cycleTestItem,
+            @Parameter(hidden = true) @RequestParam Map<String, Object> cycleTestItem, Query query) {
-            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<CycleTestItemExcel> list = service.exportCycleTestItem(queryWrapper);
+
+        List<CycleTestItemVO> listVO = service2.listWithoutPage(cycleTestItem);
+        List<CycleTestItemExcel> listExcel = BeanUtil.copyToList(listVO, CycleTestItemExcel.class);
         ExcelUtil.export(response, "[周期试验项目]数据" + DateUtil.time(),
-                "[周期试验项目]数据表", list,
+                "[周期试验项目]数据表", listExcel,
                 CycleTestItemExcel.class);
     }
 

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("试验标准")
+    @ExcelProperty("执行标准")
-    private String standard;
+    private String cycleTestStandardName;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestItemMapper.xml

@@ -18,7 +18,7 @@
     <select id="selectCycleTestItemPage" resultMap="cycleTestItemResultMap">
         SELECT *
         FROM QA_CYCLE_TEST_ITEM
-        WHERE is_deleted = 0
+        WHERE IS_DELETED = 0
         <if test="q.name != null and q.name != ''">
             AND NAME LIKE '%' || #{q.name} || '%'
         </if>

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestItemService2.java

@@ -47,9 +47,7 @@ public class CycleTestItemService2 {
      * @param query
      * @return
      */
-    public R<IPage<CycleTestItemVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> map,
+    public R<IPage<CycleTestItemVO>> list(Map<String, Object> map, Query query) {
-                                          Query query) {
-
         QueryWrapper<CycleTestItem> qw = Condition.getQueryWrapper(map, CycleTestItem.class);
         qw.orderByDesc(BaseCol.ID);
         IPage<CycleTestItem> pages = service.page(Condition.getPage(query), qw);
@@ -61,6 +59,23 @@ public class CycleTestItemService2 {
         return R.data(pagesVO);
     }
 
+    /**
+     * list 不分页
+     *
+     * @param map
+     * @return
+     */
+    public List<CycleTestItemVO> listWithoutPage(Map<String, Object> map) {
+        QueryWrapper<CycleTestItem> qw = Condition.getQueryWrapper(map, CycleTestItem.class);
+        qw.orderByDesc(BaseCol.ID);
+        List<CycleTestItem> pages = service.list(qw);
+        List<CycleTestItemVO> pagesVO = CycleTestItemWrapper.build().listVO(pages);
+        pagesVO.stream()
+                .peek(this::setVOValue)
+                .collect(Collectors.toList());
+        return pagesVO;
+    }
+
     /**
      * search
      *