From c55ad21ea14f15841df3ed08c9c2eccbf0fe70e5 Mon Sep 17 00:00:00 2001 From: chen <2710907404@qq.com> Date: Tue, 29 Apr 2025 09:41:13 +0800 Subject: [PATCH] =?UTF-8?q?20250429=20=E6=9B=B4=E6=96=B0=201.=E9=99=A4?= =?UTF-8?q?=E5=8E=BB=E6=A3=80=E5=87=BA=E7=BB=93=E6=9E=9C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EntrustMaterialCheckoutResultController.java | 13 ------------- .../entrustment/misc/ProcessFlowMapper.java | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java index 161aa2c..d6652c1 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java +++ b/src/main/java/digital/laboratory/platform/entrustment/controller/EntrustMaterialCheckoutResultController.java @@ -73,19 +73,6 @@ public class EntrustMaterialCheckoutResultController { return R.ok(voiPage); } - @ApiOperation("导出检材检出结果的excel表格") - @PostMapping("/exportExcel") - public void exportExcel(@RequestBody List entrustIds, HttpServletResponse response) { - if (CollUtil.isEmpty(entrustIds)) { - throw new CheckedException("请选择要导出的委托检出结果信息！"); - } - try { - entrustMaterialCheckoutResultService.exportExcel(entrustIds, response); - } catch (IOException e) { - throw new CheckedException("导出excel失败！"); - } - } - @ApiOperation("查询所有检出检材的毒品种类清单，并按名称进行排序") @GetMapping("/getResultType") public R getResultType(Integer year, String orgId) { diff --git a/src/main/java/digital/laboratory/platform/entrustment/misc/ProcessFlowMapper.java b/src/main/java/digital/laboratory/platform/entrustment/misc/ProcessFlowMapper.java index 05e121d..f89060d 100644 --- a/src/main/java/digital/laboratory/platform/entrustment/misc/ProcessFlowMapper.java +++ b/src/main/java/digital/laboratory/platform/entrustment/misc/ProcessFlowMapper.java @@ -7,7 +7,7 @@ import digital.laboratory.platform.entrustment.enums.EntrustStatusConstants; * 流程映射定义 */ public class ProcessFlowMapper { - public static int getNextStatus(int currentStatus, int opCode) { + public static int getNextStatus(int currentStatus, int opCode) { int processFlowMapper[][] = { {EntrustStatusConstants.ENTRUST_STATUS_CREATED.getStatus(), 1, EntrustStatusConstants.ENTRUST_STATUS_WAITING_CHECK_CLAIM.getStatus()},