From 191ddf0df80bba2ce49249c47faede9874505450 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Thu, 22 Jan 2026 16:04:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=AA=8C=E9=A1=B9=E7=9B=AE=E5=91=A8?= =?UTF-8?q?=E6=9C=9F,=E6=B7=BB=E5=8A=A0=E8=8B=A5=E5=B9=B2=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/pojo/request/CycleTestSearch.java | 14 ++++ .../desk/quality/pojo/vo/CycleTestVO.java | 2 + .../controller/AuditFileController.java | 1 - .../controller/CycleTestController.java | 32 ++++++-- .../desk/quality/mapper/CycleTestMapper.java | 6 ++ .../desk/quality/mapper/CycleTestMapper.xml | 76 ++++++++++++++++++- .../quality/service/CycleTestService2.java | 17 +---- .../quality/service/ICycleTestService.java | 5 ++ .../service/impl/CycleTestServiceImpl.java | 15 ++++ 9 files changed, 142 insertions(+), 26 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSearch.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSearch.java new file mode 100644 index 00000000..150c0a08 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSearch.java @@ -0,0 +1,14 @@ +package org.springblade.desk.quality.pojo.request; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.CycleTestVO; + +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class CycleTestSearch extends CycleTestVO { + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java index e0d9a8a9..1bd0587e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java @@ -6,6 +6,7 @@ package org.springblade.desk.quality.pojo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springblade.desk.quality.pojo.entity.CycleTest; import java.io.Serial; @@ -18,6 +19,7 @@ import java.io.Serial; */ @Data @EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) public class CycleTestVO extends CycleTest { @Serial diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java index 16e84470..0ca67d39 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java @@ -84,7 +84,6 @@ public class AuditFileController extends BladeController { Query query) { // QueryWrapper qw = Condition.getQueryWrapper(map, AuditFile.class); AuditFileSearch search = BeanUtil.toBeanIgnoreError(map, AuditFileSearch.class); - log.info("search = " + search); IPage pages = service.listSearch(Condition.getPage(query), search); IPage pagesVO = AuditFileWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java index 4691bb02..16528460 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.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; @@ -22,14 +23,15 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.CycleTestExcel; +import org.springblade.desk.quality.pojo.entity.AuditFile; import org.springblade.desk.quality.pojo.entity.CycleTest; import org.springblade.desk.quality.pojo.request.CycleTestBatUpdateCycle; +import org.springblade.desk.quality.pojo.request.CycleTestSearch; import org.springblade.desk.quality.pojo.request.CycleTestSubmit; import org.springblade.desk.quality.pojo.vo.CycleTestVO; import org.springblade.desk.quality.service.CycleTestService2; @@ -42,6 +44,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * [周期试验] 控制器 @@ -50,11 +53,11 @@ import java.util.Map; * @since 2025-11-17 */ @RestController +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/CycleTest") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/CycleTest") @Tag(name = "[QA][周期试验]", description = "[周期试验]接口") public class CycleTestController extends BladeController { @@ -82,9 +85,17 @@ public class CycleTestController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @Operation(summary = "list分页", description = "传入cycleTest") - public R> list(@Parameter(hidden = true) @RequestParam Map cycleTest, + public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - return service2.list(cycleTest, query); + // 填充bean + CycleTestSearch search = BeanUtil.toBeanIgnoreError(map, CycleTestSearch.class); + log.info("search = " + search); + IPage pagesVO = service.listSearch(Condition.getPage(query), search); + pagesVO.getRecords() + .stream() + .peek(service2::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); } /** @@ -187,15 +198,20 @@ public class CycleTestController extends BladeController { @GetMapping("/export-excel") @ApiOperationSupport(order = 8) @Operation(summary = "导出数据", description = "传入cycleTest") - public void exportCycleTest(@Parameter(hidden = true) @RequestParam Map cycleTest, + public void exportCycleTest(@Parameter(hidden = true) @RequestParam Map map, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(cycleTest, CycleTest.class); + // QueryWrapper queryWrapper = Condition.getQueryWrapper(cycleTest, CycleTest.class); //if (!AuthUtil.isAdministrator()) { // queryWrapper.lambda().eq(CycleTest::getTenantId, bladeUser.getTenantId()); //} //queryWrapper.lambda().eq(CycleTestEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List listVO = service2.listWithoutPage(cycleTest); - List listExcel = BeanUtil.copyProperties(listVO, CycleTestExcel.class); + CycleTestSearch search = BeanUtil.toBeanIgnoreError(map, CycleTestSearch.class); + log.info("search = " + search); + List listVO = service.listSearchWithoutPage(search); + listVO.stream() + .peek(service2::setVOValue) + .collect(Collectors.toList()); + List listExcel = BeanUtil.copyToList(listVO, CycleTestExcel.class); ExcelUtil.export(response, "[周期试验]数据" + DateUtil.time(), "[周期试验]数据表", listExcel, CycleTestExcel.class); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestMapper.java index cd9291d9..3f8c583d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestMapper.java @@ -9,7 +9,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.quality.excel.CycleTestExcel; import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.request.CycleTestSearch; import org.springblade.desk.quality.pojo.vo.CycleTestVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; import java.util.List; @@ -37,4 +39,8 @@ public interface CycleTestMapper extends BaseMapper { * @return List */ List exportCycleTest(@Param("ew") Wrapper queryWrapper); + + List listSearch(IPage page, @Param("q") CycleTestSearch q); + + List listSearchWithoutPage(@Param("q") CycleTestSearch q); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestMapper.xml index 125f8a16..ee622571 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestMapper.xml @@ -42,7 +42,7 @@ + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java index a3dcd965..923f6c1d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java @@ -20,6 +20,7 @@ import org.springblade.desk.quality.pojo.entity.CycleTest; import org.springblade.desk.quality.pojo.entity.CycleTestItem; import org.springblade.desk.quality.pojo.entity.CycleTestStandard; import org.springblade.desk.quality.pojo.request.CycleTestBatUpdateCycle; +import org.springblade.desk.quality.pojo.request.CycleTestSearch; import org.springblade.desk.quality.pojo.request.JobExt; import org.springblade.desk.quality.pojo.vo.CycleTestVO; import org.springblade.desk.quality.pojo.vo.CycleTestStandardVO; @@ -129,22 +130,6 @@ public class CycleTestService2 { return R.success("批量设置试验周期成功"); } - /** - * list - * - * @param cycleTest - * @param query - * @return - */ - public R> list(Map cycleTest, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(cycleTest, CycleTest.class); - qw.orderByAsc(BaseCol.ID); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = CycleTestWrapper.build().pageVO(pages); - pagesVO.getRecords().stream().peek(this::setVOValue).collect(Collectors.toList()); - return R.data(pagesVO); - } - /** * list 不分页 * diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ICycleTestService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ICycleTestService.java index 99569c4c..f7913791 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ICycleTestService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ICycleTestService.java @@ -10,6 +10,7 @@ import org.springblade.core.tool.api.R; import org.springblade.desk.quality.excel.CycleTestExcel; import org.springblade.desk.quality.excel.CycleTestExcelImport; import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.request.CycleTestSearch; import org.springblade.desk.quality.pojo.request.CycleTestSubmit; import org.springblade.desk.quality.pojo.vo.CycleTestVO; import org.springframework.web.multipart.MultipartFile; @@ -41,6 +42,10 @@ public interface ICycleTestService extends BaseService { */ List exportCycleTest(Wrapper queryWrapper); + IPage listSearch(IPage page, CycleTestSearch search); + + List listSearchWithoutPage(CycleTestSearch search); + /** * VO * diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java index 32d1a3bf..35fae867 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java @@ -14,6 +14,8 @@ import lombok.EqualsAndHashCode; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.config.RoleConfig; @@ -23,6 +25,7 @@ import org.springblade.desk.quality.excel.listener.in.CycleTestListener; import org.springblade.desk.quality.mapper.CycleTestMapper; import org.springblade.desk.quality.pojo.entity.CycleTest; import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.request.CycleTestSearch; import org.springblade.desk.quality.pojo.request.CycleTestSubmit; import org.springblade.desk.quality.pojo.vo.CycleTestVO; import org.springblade.desk.quality.service.ICycleTestItemService; @@ -35,6 +38,8 @@ import org.springframework.web.multipart.MultipartFile; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * [周期试验] 服务实现类 @@ -73,6 +78,16 @@ public class CycleTestServiceImpl extends BaseServiceImpl listSearch(IPage page, CycleTestSearch search) { + return page.setRecords(baseMapper.listSearch(page, search)); + } + + @Override + public List listSearchWithoutPage(CycleTestSearch search) { + return baseMapper.listSearchWithoutPage(search); + } + @Override public void setVOValue(CycleTestVO vo) {