workTankName

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<Double> testList = new ArrayList<>();
 
+    @TableField(exist = false)
+    private String workTankName;
+
 }

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<LiquidTankTaskCopyVO> getListByLiquidTankReportId(Long liquidTankReportId) {
 		LambdaQueryWrapper<RelTankWaveItem> qw = Wrappers.lambdaQuery();
@@ -90,9 +93,15 @@ public class LiquidTankWaveController extends BladeController {
 		List<RelTankWaveItem> relList = relReportItemService.list(qw);
 //		List<LiquidTankTaskCopyVO> copyList = new ArrayList<>();
 		List<LiquidTankTaskCopy> 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<Double> max = Arrays.stream(relOne.getMaxList().split(","))
 					.mapToDouble(Double::parseDouble) // 将字符串转换为double