From 2c2bb858b798b63cccd6f51121a4207cc3519e1c Mon Sep 17 00:00:00 2001 From: Tom Li Date: Thu, 8 Jan 2026 15:30:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86mapper=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/request/InspectionTaskSearch.java | 2 + .../{CheckType.java => CheckWorkType.java} | 5 ++- .../controller/InspectionTaskController.java | 30 ++++++++------- .../mapper/CycleTestStandardMapper.xml | 3 +- .../mapper/IndicatorYearDetailMapper.xml | 16 +++++--- .../quality/mapper/InspectionItemMapper.xml | 16 +++++--- .../quality/mapper/InspectionResultMapper.xml | 16 +++++--- .../desk/quality/mapper/IotHardnessMapper.xml | 13 +++++-- .../quality/mapper/IotThicknessMapper.xml | 16 +++++--- .../desk/quality/mapper/LiquidTankMapper.xml | 10 +++-- .../desk/quality/mapper/PlanTestMapper.xml | 10 +++-- .../mapper/ProReTemplateDetailMapper.xml | 16 +++++--- .../mapper/ProReTemplateTankMapper.xml | 16 +++++--- .../desk/quality/mapper/RemindMsgMapper.xml | 10 +++-- .../desk/quality/mapper/ReviewDutyMapper.xml | 10 +++-- .../desk/quality/mapper/ReviewFaultMapper.xml | 13 +++++-- .../desk/quality/mapper/ReviewSheetMapper.xml | 13 +++++-- .../quality/mapper/StandardParamMapper.xml | 16 +++++--- .../quality/mapper/SupplyInspectionMapper.xml | 2 +- .../mapper/WorkPlanItemDetailMapper.xml | 16 +++++--- .../quality/mapper/WorkPlanItemMapper.xml | 16 +++++--- .../service/IInspectionTaskService.java | 37 +++++++++++-------- .../impl/InspectionTaskServiceImpl.java | 7 ++++ 23 files changed, 208 insertions(+), 101 deletions(-) rename blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/{CheckType.java => CheckWorkType.java} (69%) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java index f1851ffe..2869e294 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java @@ -39,4 +39,6 @@ public class InspectionTaskSearch extends InspectionTask { private LocalDate receiveDateStart; @Schema(description = "接收时间-结束") private LocalDate receiveDateEnd; + @Schema(description = "质量检验类型") + private Integer checkWorkType; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckType.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckWorkType.java similarity index 69% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckType.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckWorkType.java index 00e3dc0e..ad127aba 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckType.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckWorkType.java @@ -1,6 +1,9 @@ package org.springblade.desk.quality.constant; -public interface CheckType { +/** + * 质检工作类型。 + */ +public interface CheckWorkType { /** * 热表 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index fe866737..acb0bdad 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -26,8 +26,10 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; import org.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.desk.quality.service.InspectionTaskService2; import org.springblade.desk.quality.wrapper.InspectionTaskWrapper; @@ -51,9 +53,9 @@ import java.util.Map; public class InspectionTaskController extends BladeController { @Resource - private IInspectionTaskService inspectionTaskGenService; + private IInspectionTaskService service; @Resource - private InspectionTaskService2 service; + private InspectionTaskService2 service2; /** * [检验任务] 详情 @@ -62,18 +64,20 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 1) @Operation(summary = "详情", description = "传入inspectionTask") public R detail(InspectionTask inspectionTask) { - InspectionTask detail = inspectionTaskGenService.getOne(Condition.getQueryWrapper(inspectionTask)); + InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask)); return R.data(InspectionTaskWrapper.build().entityVO(detail)); } /** * [检验任务] 分页 */ - @GetMapping("/list") + @PostMapping("/listTask") @ApiOperationSupport(order = 2) @Operation(summary = "分页", description = "传入inspectionTask") - public R> list(@Parameter(hidden = true) @RequestParam Map inspectionTask, Query query) { - IPage pages = inspectionTaskGenService.page(Condition.getPage(query), Condition.getQueryWrapper(inspectionTask, InspectionTask.class)); + public R> listTask( + @Parameter(hidden = true) @RequestParam InspectionTaskSearch search, Query query) { + IPage pages = service.listTask(Condition.getPage(query), qw); + ???? return R.data(InspectionTaskWrapper.build().pageVO(pages)); } @@ -85,7 +89,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 3) @Operation(summary = "分页", description = "传入inspectionTask") public R> page(InspectionTaskDetailVO inspectionTask, Query query) { - IPage pages = inspectionTaskGenService.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); + IPage pages = service.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); return R.data(pages); } @@ -96,7 +100,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 4) @Operation(summary = "新增", description = "传入inspectionTask") public R save(@Valid @RequestBody InspectionTask inspectionTask) { - return R.status(inspectionTaskGenService.save(inspectionTask)); + return R.status(service.save(inspectionTask)); } /** @@ -106,7 +110,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 5) @Operation(summary = "修改", description = "传入inspectionTask") public R update(@Valid @RequestBody InspectionTask inspectionTask) { - return R.status(inspectionTaskGenService.updateById(inspectionTask)); + return R.status(service.updateById(inspectionTask)); } /** @@ -116,7 +120,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 6) @Operation(summary = "新增或修改", description = "传入inspectionTask") public R submit(@Valid @RequestBody InspectionTask inspectionTask) { - return R.status(inspectionTaskGenService.saveOrUpdate(inspectionTask)); + return R.status(service.saveOrUpdate(inspectionTask)); } /** @@ -126,7 +130,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 7) @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(inspectionTaskGenService.deleteLogic(Func.toLongList(ids))); + return R.status(service.deleteLogic(Func.toLongList(ids))); } /** @@ -142,7 +146,7 @@ public class InspectionTaskController extends BladeController { // queryWrapper.lambda().eq(InspectionTask::getTenantId, bladeUser.getTenantId()); //} //queryWrapper.lambda().eq(InspectionTaskEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = inspectionTaskGenService.exportInspectionTask(queryWrapper); + List list = service.exportInspectionTask(queryWrapper); ExcelUtil.export(response, "[检验任务]数据" + DateUtil.time(), "[检验任务]数据表", list, InspectionTaskExcel.class); } @@ -155,6 +159,6 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 9) @Operation(summary = "", description = "传入inspectionTask") public R save(@Valid @RequestBody InspectionTaskStartNew start) { - return service.startNew(start); + return service2.startNew(start); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestStandardMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestStandardMapper.xml index d0fbcd77..8a58efa1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestStandardMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestStandardMapper.xml @@ -4,7 +4,8 @@ - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IndicatorYearDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IndicatorYearDetailMapper.xml index 08038435..af226c01 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IndicatorYearDetailMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IndicatorYearDetailMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -12,10 +14,14 @@ - + SELECT * + FROM QA_INDICATOR_YEAR_DETAIL ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.xml index bc121284..7b7183b2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -24,10 +26,14 @@ - + SELECT * + FROM QA_INSPECTION_ITEM ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionResultMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionResultMapper.xml index c602efe6..e30c5a02 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionResultMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionResultMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -23,10 +25,14 @@ - + SELECT * + FROM QA_INSPECTION_RESULT ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.xml index d8ce05a4..1f11d0dc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -17,10 +19,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml index e63aa6de..653c9a6e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -17,10 +19,14 @@ - + SELECT * + FROM QA_IOT_THICKNESS ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankMapper.xml index e4d45c86..28d23342 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankMapper.xml @@ -1,5 +1,6 @@ - + @@ -58,10 +59,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/PlanTestMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/PlanTestMapper.xml index 1ac0a75d..543fe787 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/PlanTestMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/PlanTestMapper.xml @@ -1,5 +1,6 @@ - + @@ -25,10 +26,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateDetailMapper.xml index 86704e55..54c52fd4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateDetailMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateDetailMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -16,10 +18,14 @@ - + SELECT * + FROM QA_PRO_RE_TEMPLATE_DETAIL ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateTankMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateTankMapper.xml index 68f7091a..d443a5b1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateTankMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateTankMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -12,10 +14,14 @@ - + SELECT * + FROM QA_PRO_RE_TEMPLATE_TANK ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RemindMsgMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RemindMsgMapper.xml index 33deda73..19032093 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RemindMsgMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RemindMsgMapper.xml @@ -1,5 +1,6 @@ - + @@ -26,10 +27,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml index 6af5e14f..f8e6c3cc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml @@ -1,5 +1,6 @@ - + @@ -15,10 +16,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml index 852c6f50..2effe1c1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -14,10 +16,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml index bf15a0bc..5d1e55b9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -44,10 +46,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardParamMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardParamMapper.xml index 8ccdb507..18a1e34b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardParamMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardParamMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -30,10 +32,14 @@ - + SELECT * + FROM QA_STANDARD_PARAM ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/SupplyInspectionMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/SupplyInspectionMapper.xml index 7ad52e47..81150de8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/SupplyInspectionMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/SupplyInspectionMapper.xml @@ -12,7 +12,7 @@ - + - SELECT * FROM QA_WORK_PLAN_ITEM_DETAIL WHERE is_deleted = 0 + SELECT * + FROM QA_WORK_PLAN_ITEM_DETAIL + WHERE is_deleted = 0 - + SELECT * + FROM QA_WORK_PLAN_ITEM_DETAIL ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml index 8abe8903..8945a7eb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -24,10 +26,14 @@ - + SELECT * + FROM QA_WORK_PLAN_ITEM ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java index 6c724cd9..130be04e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java @@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; import java.util.List; @@ -19,26 +21,29 @@ import java.util.List; * @since 2025-12-23 */ public interface IInspectionTaskService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param inspectionTask 查询参数 - * @return IPage - */ - IPage selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask); + /** + * 自定义分页 + * + * @param page 分页参数 + * @param inspectionTask 查询参数 + * @return IPage + */ + IPage selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask); - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportInspectionTask(Wrapper queryWrapper); + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportInspectionTask(Wrapper queryWrapper); /** * VO + * * @param vo */ - void setVOValue(InspectionTaskDetailVO vo); + void setVOValue(InspectionTaskDetailVO vo); + + List listTask(InspectionTaskSearch search); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index 61431ad4..845ce030 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -14,7 +14,9 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.mapper.InspectionTaskMapper; import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; import org.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; @@ -58,4 +60,9 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl listTask(InspectionTaskSearch search) { + return List.of(); + } }