From c9473b2fe88ba91a5b55bbf3d15b45b3c7d3defb Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Mon, 23 Mar 2026 16:40:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E7=AE=A1=E7=90=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LiquidTankTaskCopyController.java | 60 +++++++------ .../service/LiquidTankTaskSetVoService.java | 87 +++++++++++++++---- 2 files changed, 98 insertions(+), 49 deletions(-) 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 ec293b68..541339ba 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 @@ -639,39 +639,37 @@ public class LiquidTankTaskCopyController extends BladeController { // List list = service.getListByLiquidTankReportId(report.getId()); List list = service.getListByLiquidTankReportIdNew(report.getId()); + if(null != list && list.size() > 0){ + + Long centerId = list.get(0).getWorkCenterId(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("WC_ID",centerId); + List rule = configService.list(queryWrapper); + String name = ""; + String tableTtile =""; + if(null != rule && rule.size() > 0){ + name = rule.get(0).getNamePrefix(); + tableTtile = rule.get(0).getReportCode(); + } + try { + FullMergeExcelUtil.exportUserExcel( + response, + "槽液检测报告", + name, + tableTtile, + new String[]{"取样时间", "温度(℃)", "槽号", "体积(L)", "分析项目", "规范下限(g/L)", "目标下限(g/L)", + "添加点(g/L)", "目标值(g/L)","目标上限(g/L)","规范上限(g/L)","化验频率","化验值(g/L)", + "药品计算公式","药品添加量","药品批次号","药品监督员签名","药品添加人签名","调整后化验值(g/L)", + "是否合格","有效期","超出规范极限调整后的结果","槽液清理记录","控制规范"}, + list, + new int[]{0} + ); + } catch (Exception e) { + throw new RuntimeException(e); + } - - Long centerId = list.get(0).getWorkCenterId(); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("WC_ID",centerId); - List rule = configService.list(queryWrapper); - String name = ""; - String tableTtile =""; - if(null != rule && rule.size() > 0){ - name = rule.get(0).getNamePrefix(); - tableTtile = rule.get(0).getReportCode(); - } - - - try { - FullMergeExcelUtil.exportUserExcel( - response, - "槽液检测报告", - name, - tableTtile, - new String[]{"取样时间", "温度(℃)", "槽号", "体积(L)", "分析项目", "规范下限(g/L)", "目标下限(g/L)", - "添加点(g/L)", "目标值(g/L)","目标上限(g/L)","规范上限(g/L)","化验频率","化验值(g/L)", - "药品计算公式","药品添加量","药品批次号","药品监督员签名","药品添加人签名","调整后化验值(g/L)", - "是否合格","有效期","超出规范极限调整后的结果","槽液清理记录","控制规范"}, - list, - new int[]{0} - ); - } catch (Exception e) { - throw new RuntimeException(e); } - - } /** 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 66b2ecd4..08d30359 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 @@ -6,6 +6,7 @@ import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.springblade.core.tool.api.R; import org.springblade.desk.basic.pojo.entity.Formula; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.entity.WorkCenter; @@ -76,43 +77,93 @@ public class LiquidTankTaskSetVoService { vo.setWcName(wc.getWcName()); } if (IdUtil.isValid(vo.getTestUserId())) { - UserInfo testUI = userClient.userInfo(vo.getTestUserId()).getData(); - if (testUI != null) { - vo.setTestUserRealName(testUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getTestUserId()); + if(null != r){ + UserInfo testUI = r.getData(); + if (testUI != null) { + vo.setTestUserRealName(testUI.getUser().getRealName()); + } } } if (IdUtil.isValid(vo.getRepeatTestUserId())) { - UserInfo repeatTestUI = userClient.userInfo(vo.getRepeatTestUserId()).getData(); - if (repeatTestUI != null) { - vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getRepeatTestUserId()); + if(null != r){ + UserInfo repeatTestUI = r.getData(); + if (repeatTestUI != null) { + vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName()); + } } + +// UserInfo repeatTestUI = userClient.userInfo(vo.getRepeatTestUserId()).getData(); +// if (repeatTestUI != null) { +// vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName()); +// } } if (IdUtil.isValid(vo.getProcessUserId())) { - UserInfo processUI = userClient.userInfo(vo.getProcessUserId()).getData(); - if (processUI != null) { - vo.setProcessUserRealName(processUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getProcessUserId()); + if(null != r){ + UserInfo processUI = r.getData(); + if (processUI != null) { + vo.setProcessUserRealName(processUI.getUser().getRealName()); + } } + +// UserInfo processUI = userClient.userInfo(vo.getProcessUserId()).getData(); +// if (processUI != null) { +// vo.setProcessUserRealName(processUI.getUser().getRealName()); +// } } // 审核人 if (IdUtil.isValid(vo.getReviewUserId())) { - UserInfo reviewUI = userClient.userInfo(vo.getReviewUserId()).getData(); - if (reviewUI != null) { - vo.setReviewUserRealName(reviewUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getReviewUserId()); + if(null != r){ + UserInfo reviewUI = r.getData(); + if (reviewUI != null) { + vo.setReviewUserRealName(reviewUI.getUser().getRealName()); + } } + + +// UserInfo reviewUI = userClient.userInfo(vo.getReviewUserId()).getData(); +// if (reviewUI != null) { +// vo.setReviewUserRealName(reviewUI.getUser().getRealName()); +// } } // 发药人 if (IdUtil.isValid(vo.getSendDrugUserId())) { - UserInfo sendUI = userClient.userInfo(vo.getSendDrugUserId()).getData(); - if (sendUI != null) { - vo.setSendDurgUserRealName(sendUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getSendDrugUserId()); + if(null != r){ + UserInfo sendUI = r.getData(); + if (sendUI != null) { + vo.setSendDurgUserRealName(sendUI.getUser().getRealName()); + } } + +// UserInfo sendUI = userClient.userInfo(vo.getSendDrugUserId()).getData(); +// if (sendUI != null) { +// vo.setSendDurgUserRealName(sendUI.getUser().getRealName()); +// } } // 领药人 if (IdUtil.isValid(vo.getReceiveDrugUserId())) { - UserInfo receiveUI = userClient.userInfo(vo.getReceiveDrugUserId()).getData(); - if (receiveUI != null && receiveUI.getUser() != null) { - vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName()); + + R r = userClient.userInfo(vo.getReceiveDrugUserId()); + if(null != r){ + UserInfo receiveUI = r.getData(); + if (receiveUI != null) { + vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName()); + } } + +// UserInfo receiveUI = userClient.userInfo(vo.getReceiveDrugUserId()).getData(); +// if (receiveUI != null && receiveUI.getUser() != null) { +// vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName()); +// } } WorkTank wt = workTankService.getById(vo.getWorkTankId()); if (wt != null) {