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 95565e0..77574dc 100644 --- a/src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java +++ b/src/main/java/digital/laboratory/platform/reagent/controller/ReagentConsumableInventoryController.java @@ -172,7 +172,7 @@ public class ReagentConsumableInventoryController { String applyFileName = "标准物质一览表-" + id; - String pdfFilePath = "document" + "/" + "referenceMaterial" + "/" + id + "/" + applyFileName + ".pdf"; + String pdfFilePath = "document" + "/" + "referenceMaterial" + "/" + id + "/" + applyFileName + ".docx"; try { //直接调用pdf方法 reagentConsumableInventoryService.referenceMaterialTablePDF(voList, id, theHttpServletRequest, httpServletResponse); 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 c3aa4ad..965ffb8 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 @@ -340,6 +340,9 @@ public class ReagentConsumableInventoryServiceImpl extends ServiceImpl voList, String id, HttpServletRequest theHttpServletRequest, HttpServletResponse httpServletResponse) throws Exception { System.out.println("referenceMaterialTablePDF................."); + for (ReferenceMaterialVO referenceMaterialVO : voList) { + referenceMaterialVO.setTime(LocalDateTimeUtil.format(referenceMaterialVO.getCreateTime(),"yyyy-MM-dd")); + } int x = 1; for (ReferenceMaterialVO referenceMaterialVO : voList) { @@ -381,25 +384,27 @@ public class ReagentConsumableInventoryServiceImpl extends ServiceImplquery().eq("reagent_consumable_id", byId.getReagentConsumableId())); - if (one != null) { - warehousingContentVO.setWarningValue(one.getWarningValue()); - } + warehousingContentVO.setWarningValue(one.getWarningValue());} } - } return warehousingContentVOList; } @@ -78,6 +75,4 @@ public class WarehousingContentServiceImpl extends ServiceImpl