From 909afcfae5959baf2982f73e497b2ed617fa9f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= Date: Tue, 12 May 2026 11:07:44 +0800 Subject: [PATCH] workTankName --- .../desk/quality/pojo/entity/LiquidTankTaskCopy.java | 3 +++ .../quality/controller/LiquidTankWaveController.java | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java index e84bd0d66..c418c505a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java @@ -571,4 +571,7 @@ public class LiquidTankTaskCopy extends BaseEntity { @TableField(exist = false) private List testList = new ArrayList<>(); + @TableField(exist = false) + private String workTankName; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java index 281fca016..a7faba29e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java @@ -29,7 +29,9 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.constant.BaseRequest; import org.springblade.desk.basic.pojo.entity.WorkCenter; +import org.springblade.desk.basic.pojo.entity.WorkTank; import org.springblade.desk.basic.service.IWorkCenterService; +import org.springblade.desk.basic.service.IWorkTankService; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.basic.util.RequestUtil; import org.springblade.desk.quality.constant.QAModuleConst; @@ -82,7 +84,8 @@ public class LiquidTankWaveController extends BladeController { private IUserClient userClient; @Resource private IWorkCenterService workCenterService; - + @Resource + private IWorkTankService workTankService; public List getListByLiquidTankReportId(Long liquidTankReportId) { LambdaQueryWrapper qw = Wrappers.lambdaQuery(); @@ -90,9 +93,15 @@ public class LiquidTankWaveController extends BladeController { List relList = relReportItemService.list(qw); // List copyList = new ArrayList<>(); List list = new ArrayList<>(); + for (RelTankWaveItem relOne : relList) { Long taskId = relOne.getLiquidTankTaskId(); LiquidTankTaskCopy copy = copyService.getById(taskId); + final Long wtId = copy.getWorkTankId(); + WorkTank tanke = workTankService.getById(wtId); + if(tanke != null){ + copy.setWorkTankName(tanke.getWorkTankCode()); + } List max = Arrays.stream(relOne.getMaxList().split(",")) .mapToDouble(Double::parseDouble) // 将字符串转换为double