From a921aa15599e2e5a8e30607f175acb4bee6bd0e7 Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Sun, 8 Mar 2026 12:39:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=A7=BD=E4=BF=AE=E6=94=B900?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/LiquidTankTaskSetVoService.java | 14 ++++++++++---- .../impl/LiquidTankTaskCopyServiceImpl.java | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java index 9ce2d3cc..66b2ecd4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java @@ -116,7 +116,7 @@ public class LiquidTankTaskSetVoService { } WorkTank wt = workTankService.getById(vo.getWorkTankId()); if (wt != null) { - vo.setWorkTankName(wt.getName()); + vo.setWorkTankName(wt.getWorkTankCode()); } TeamSet teamSet = teamSetService.getById(vo.getTeamId()); if (teamSet != null) { @@ -127,10 +127,16 @@ public class LiquidTankTaskSetVoService { ); vo.setLiquidTank(lt); // 取样时间：当天时间 - if(vo.getSampleDate()== null){ - vo.setSampleDate(LocalDate.now()); +// if(vo.getSampleDate()== null){ +// vo.setSampleDate(LocalDate.now()); +// } + + if(null != vo.getFirstTestDate()){ + vo.setSampleDate(vo.getFirstTestDate().toLocalDate()); } -// vo.setSampleDate(LocalDate.now()); + +// vo.setSampleDate(vo.getFirstFillDate().toLocalDate()); + // 有效期 // Date validDateT = DateUtil.offsetDay(vo.getCreateTime(), vo.getAnalysisCycle()); // vo.setValidDate(LocalDateTimeUtil.of(validDateT).toLocalDate()); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskCopyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskCopyServiceImpl.java index 5ca5314b..37384601 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskCopyServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskCopyServiceImpl.java @@ -196,7 +196,7 @@ public class LiquidTankTaskCopyServiceImpl extends BaseServiceImpl