From 614102ecd942db59fab6564c7508d05bd4f335f9 Mon Sep 17 00:00:00 2001 From: 15036302109 Date: Thu, 21 Dec 2023 13:49:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E6=94=B9=E7=8E=87=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=AD=A3,=E7=BB=88=E6=AD=A2?= =?UTF-8?q?=E5=87=BA=E5=BA=93bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/ehs/EhsMaterialDetailController.java | 4 ++-- .../main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsMaterialDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsMaterialDetailController.java index 4ca6f50..7fcfca6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsMaterialDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsMaterialDetailController.java @@ -155,8 +155,8 @@ public class EhsMaterialDetailController extends BaseController @ApiOperation("按物资表删除未执行出库指令") @PreAuthorize("@ss.hasPermi('EhsMaterialDetail:EhsMaterialDetail:remove')") @Log(title = "按物资表删除未执行出库指令", businessType = BusinessType.DELETE) - @DeleteMapping("/{materialDetailIds}") - public AjaxResult remove(@PathVariable Long materialId) + @DeleteMapping("/{materialDetailId}") + public AjaxResult remove(@PathVariable("materialDetailId") Long materialId) { //return toAjax(ehsMaterialDetailService.removeByIds(Arrays.asList(materialDetailIds))); return toAjax(ehsMaterialDetailService.deleteEhsMaterialDetailByMaterialId(materialId)); diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml index 52d9d03..75be674 100644 --- a/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsIndexStatisticsMapper.xml @@ -12,7 +12,7 @@ sum( CASE WHEN STATUS != 10 AND rectify_term_time < NOW() THEN 1 ELSE 0 END ) exceedNotRectifiedNum, sum( rectify_money ) rectifyMoneySum, CONCAT(round( - sum( CASE WHEN STATUS = 10 THEN 1 ELSE 0 END )/ sum( CASE WHEN STATUS != 10 THEN 1 ELSE 0 END ), + sum( CASE WHEN STATUS = 10 THEN 1 ELSE 0 END )/ count( 1 ), 2 )*100,'%') rectifyRate FROM @@ -29,7 +29,7 @@ sum( CASE WHEN STATUS != 10 AND rectify_term_time < NOW() THEN 1 ELSE 0 END ) exceedNotRectifiedNum, sum( rectify_money ) rectifyMoneySum, CONCAT(round( - sum( CASE WHEN STATUS = 10 THEN 1 ELSE 0 END )/ sum( CASE WHEN STATUS != 10 THEN 1 ELSE 0 END ), + sum( CASE WHEN STATUS = 10 THEN 1 ELSE 0 END )/ count( 1 ), 2 )*100,'%') rectifyRate FROM @@ -49,7 +49,7 @@ sum( CASE WHEN r.STATUS != 10 AND r.rectify_term_time < NOW() THEN 1 ELSE 0 END ) exceedNotRectifiedNum, ifnull(sum( r.rectify_money ),0) rectifyMoneySum, CONCAT(ifnull(round( - sum( CASE WHEN r.STATUS = 10 THEN 1 ELSE 0 END )/ sum( CASE WHEN r.STATUS != 10 THEN 1 ELSE 0 END ), + sum( CASE WHEN r.STATUS = 10 THEN 1 ELSE 0 END )/ sum( CASE WHEN r.hidden_danger_id is not null THEN 1 ELSE 0 END ), 2 )* 100,0),'%') rectifyRate FROM