From 425ad68bcacd0382748007028494f76ec8da0ba6 Mon Sep 17 00:00:00 2001 From: yanghh <1344638791@qq.com> Date: Wed, 20 Dec 2023 11:57:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=80=E4=BA=9BBU?= =?UTF-8?q?G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 14 +++++------- .../PurchaseCatalogueController.java | 1 - .../ReagentConsumableInventoryController.java | 5 ++--- ...ReagentConsumableInventoryServiceImpl.java | 22 ++++++++++--------- .../vo/ReagentConsumableInventoryFullVO.java | 2 ++ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 80bc989..d0c032a 100644 --- a/pom.xml +++ b/pom.xml @@ -184,6 +184,12 @@ 2022.10.11-snapshots + + com.deepoove + poi-tl + 1.12.0 + + @@ -198,14 +204,6 @@ - - - - com.deepoove - poi-tl - 1.12.0 - - diff --git a/src/main/java/digital/laboratory/platform/reagent/controller/PurchaseCatalogueController.java b/src/main/java/digital/laboratory/platform/reagent/controller/PurchaseCatalogueController.java index 684ee39..bb7398a 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/PurchaseCatalogueController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/PurchaseCatalogueController.java @@ -476,7 +476,6 @@ public class PurchaseCatalogueController { ossFile.fileSave("document" + "/" + "purchaseCatalogue" + "/" + id + "/" + applyFileName + ".pdf", isPDF); isPDF.close(); - System.out.println(String.format("转换为 PDF 结束")); } diff --git a/src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java b/src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java index 6f6a203..e3bf4ea 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java @@ -71,8 +71,7 @@ public class ReagentConsumableInventoryController { @GetMapping("/{reagentConsumableInventoryId}") // @PreAuthorize("@pms.hasPermission('reagent_reagent_consumable_inventory_get')") public R getById(@PathVariable("reagentConsumableInventoryId") String reagentConsumableInventoryId, HttpServletRequest theHttpServletRequest) { - Principal principal = theHttpServletRequest.getUserPrincipal(); - DLPUser dlpUser = (DLPUser) ((OAuth2Authentication) principal).getUserAuthentication().getPrincipal(); + ReagentConsumableInventory reagentConsumableInventory = reagentConsumableInventoryService.getById(reagentConsumableInventoryId); return R.ok(reagentConsumableInventory); @@ -344,7 +343,7 @@ public class ReagentConsumableInventoryController { * 天平专用 * 通过扫码，获取标准物质所有信息 */ - @ApiOperation(value = "通过编号，获取标准物质所有信", notes = "通过编号，获取标准物质所有信息") + @ApiOperation(value = "通过编号，获取标准物质所有信息", notes = "通过编号，获取标准物质所有信息") @GetMapping("/getByNo") public R getByNo(String number) { ReferenceMaterial referenceMaterial = referenceMaterialService.getOne(Wrappers.query().eq("number", number)); diff --git a/src/main/java/digital/laboratory/platform/reagent/service/impl/ReagentConsumableInventoryServiceImpl.java b/src/main/java/digital/laboratory/platform/reagent/service/impl/ReagentConsumableInventoryServiceImpl.java index ad23f43..3a64aa2 100644 --- a/src/main/java/digital/laboratory/platform/reagent/service/impl/ReagentConsumableInventoryServiceImpl.java +++ b/src/main/java/digital/laboratory/platform/reagent/service/impl/ReagentConsumableInventoryServiceImpl.java @@ -26,7 +26,9 @@ import digital.laboratory.platform.reagent.service.*; import digital.laboratory.platform.reagent.vo.*; import digital.laboratory.platform.sys.entity.CabinetCell; import digital.laboratory.platform.sys.entity.CellAndStoreSupplyData; +import digital.laboratory.platform.sys.entity.SysUser; import digital.laboratory.platform.sys.feign.RemoteCabinetService; +import digital.laboratory.platform.sys.feign.RemoteUserService; import feign.Response; import io.seata.spring.annotation.GlobalTransactional; import org.apache.commons.fileupload.FileItem; @@ -102,6 +104,9 @@ public class ReagentConsumableInventoryServiceImpl extends ServiceImpl standardReserveSolutionLambdaQueryWrapper = new LambdaQueryWrapper<>(); - standardReserveSolutionLambdaQueryWrapper.eq(StandardReserveSolution::getReferenceId, referenceMaterial.getId()); - StandardReserveSolution one1 = standardReserveSolutionService.getOne(standardReserveSolutionLambdaQueryWrapper); reagentConsumableInventoryFullVO.setSupplierName(supplierInformation.getSupplierName()); @@ -292,14 +290,18 @@ public class ReagentConsumableInventoryServiceImpl extends ServiceImpl list = standardMaterialApplicationService.list(new LambdaQueryWrapper().eq(StandardMaterialApplication::getReferenceMaterialId, id).orderByDesc(StandardMaterialApplication::getDateOfClaim)); + + R userR = remoteUserService.innerGetById(list.get(0).getRecipientId()); + reagentConsumableInventoryFullVO.setHolderName(userR.getData().getName()); + if (one1 != null) { reagentConsumableInventoryFullVO.setConfigurationConcentration(one1.getConfigurationConcentration()); reagentConsumableInventoryFullVO.setConfigurationDate(one1.getConfigurationDate()); reagentConsumableInventoryFullVO.setSolutionNumbering(referenceMaterial.getNumber()); reagentConsumableInventoryFullVO.setValidityPeriod(one1.getValidityPeriod()); } - - return reagentConsumableInventoryFullVO; } @@ -799,7 +801,7 @@ public class ReagentConsumableInventoryServiceImpl extends ServiceImpl