From 3f432153777bb96f31391604ae75ffe3e08ab8ff Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Tue, 3 Mar 2026 11:27:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86=E6=A7=BD?= =?UTF-8?q?=E6=B6=B2=E7=AE=A1=E7=90=86=E6=9C=89=E6=95=88=E6=9C=9F=E6=8E=92?= =?UTF-8?q?=E6=9F=A5=EF=BC=8C=E6=A7=BD=E6=B6=B2=E4=BB=BB=E5=8A=A1=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=9F=A5=E8=AF=A2=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/pojo/vo/LiquidTankTaskCopyVO.java | 5 +- .../controller/LiquidTankTaskController.java | 83 ++++++++++++------- .../LiquidTankTaskCopyController.java | 8 +- .../quality/mapper/LiquidTankTaskMapper.java | 1 + .../quality/mapper/LiquidTankTaskMapper.xml | 20 +++++ .../service/ILiquidTankTaskService.java | 1 + .../impl/LiquidTankTaskServiceImpl.java | 9 +- 7 files changed, 88 insertions(+), 39 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java index c8b91245..e65de9b0 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java @@ -65,8 +65,8 @@ public class LiquidTankTaskCopyVO extends LiquidTankTaskCopy { private LocalDate sampleDate; @Schema(description = "化验频率(报告)") private String testFrequency; - @Schema(description = "有效期") - private LocalDate validDate; +// @Schema(description = "有效期") +// private LocalDate validDate; @Schema(description = "超出规范极限调整后的结果(报告)") private String outRangeResult; @Schema(description = "槽液清理记录(报告)") @@ -79,4 +79,5 @@ public class LiquidTankTaskCopyVO extends LiquidTankTaskCopy { private String drugAddUserSign; @Schema(description = "控制规范(报告)") private String norm; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java index 57aabd24..1013a0f3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java @@ -187,43 +187,62 @@ public class LiquidTankTaskController extends BladeController { @GetMapping("/listHandle") @ApiOperationSupport(order = 23) @Operation(summary = "list任务处理分页", description = "传入LiquidTankTask Obj") - public R> listHandle(@Parameter(hidden = true) @RequestParam Map liquidTankTask, - Query query) { - QueryWrapper qw = Condition.getQueryWrapper(liquidTankTask, LiquidTankTask.class); - qw.ne(BaseCol.STATUS, LiquidTankTaskConst.S_NOT_READY); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = LiquidTankTaskWrapper.build().pageVO(pages); - List list = pagesVO.getRecords(); - for(LiquidTankTaskVO one : list){ - LiquidTank tank = taskService.getById(one.getLiquidTankId()); - Formula detail = formualaService.getById(tank.getAddDrugFormulaId()); - if(null != detail){ - one.setAddFormulaContent(detail.getContent()); - } - Formula detailAfter = formualaService.getById(tank.getAfterTheoryFormulaId()); - - if(null != detailAfter){ - one.setAfterFormulaContent(detailAfter.getContent()); - } - - Long goodId = tank.getDrugMaterialId(); - StGoods good = new StGoods(); - good.setId(goodId); - StGoods stGoods = stRealtimeStockClient.getById(good).getData(); - one.setDrugMaterialCode(stGoods.getGoodsCode()); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("ID",one.getWorkTankId()); - List records = tankService.list(queryWrapper); - if(null != records && records.size()>0){ - one.setWorkTankName(records.get(0).getWorkTankCode()); - } - } + public R> listHandle(LiquidTankTaskVO liquidTankTask, Query query) { +// public R> listHandle(@Parameter(hidden = true) @RequestParam Map liquidTankTask, +// Query query) { + + IPage pagesVO = service.selectLiquidTankTaskPageByJoin( + Condition.getPage(query), liquidTankTask + ); + + pagesVO.getRecords() .stream() .peek(service::setVOValue) .collect(Collectors.toList()); return R.data(pagesVO); + +// +// QueryWrapper qw = Condition.getQueryWrapper(liquidTankTask, LiquidTankTask.class); +// qw.ne(BaseCol.STATUS, LiquidTankTaskConst.S_NOT_READY); +// IPage pages = service.page(Condition.getPage(query), qw); +// IPage pagesVO = LiquidTankTaskWrapper.build().pageVO(pages); +// +// List list = pagesVO.getRecords(); +// for(LiquidTankTaskVO one : list){ +// LiquidTank tank = taskService.getById(one.getLiquidTankId()); +// if(null != tank){ +// Formula detail = formualaService.getById(tank.getAddDrugFormulaId()); +// if(null != detail){ +// one.setAddFormulaContent(detail.getContent()); +// } +// +// Formula detailAfter = formualaService.getById(tank.getAfterTheoryFormulaId()); +// if(null != detailAfter){ +// one.setAfterFormulaContent(detailAfter.getContent()); +// } +// } +// +// +// +// Long goodId = tank.getDrugMaterialId(); +// StGoods good = new StGoods(); +// good.setId(goodId); +// StGoods stGoods = stRealtimeStockClient.getById(good).getData(); +// one.setDrugMaterialCode(stGoods.getGoodsCode()); +// +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.eq("ID",one.getWorkTankId()); +// List records = tankService.list(queryWrapper); +// if(null != records && records.size()>0){ +// one.setWorkTankName(records.get(0).getWorkTankCode()); +// } +// } +// pagesVO.getRecords() +// .stream() +// .peek(service::setVOValue) +// .collect(Collectors.toList()); +// return R.data(pagesVO); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java index 21a97d0b..b2df0618 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java @@ -144,10 +144,10 @@ public class LiquidTankTaskCopyController extends BladeController { } } - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); +// pagesVO.getRecords() +// .stream() +// .peek(service::setVOValue) +// .collect(Collectors.toList()); return R.data(pagesVO); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.java index 58e19de9..3a063934 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.java @@ -29,6 +29,7 @@ public interface LiquidTankTaskMapper extends BaseMapper { * @return List */ List selectLiquidTankTaskPage(IPage page, LiquidTankTaskVO liquidTankTask); + List selectLiquidTankTaskPageByJoin(IPage page, @Param("task") LiquidTankTaskVO liquidTankTask); /** * 获取导出数据 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml index b4701329..316e0988 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml @@ -69,6 +69,26 @@ WHERE is_deleted = 0 + +