整改率计算方式修正,终止出库bug修改

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}")
+	@DeleteMapping("/{materialDetailId}")
-    public AjaxResult remove(@PathVariable Long  materialId)
+    public AjaxResult remove(@PathVariable("materialDetailId") Long  materialId)
     {
         //return toAjax(ehsMaterialDetailService.removeByIds(Arrays.asList(materialDetailIds)));
 	    return toAjax(ehsMaterialDetailService.deleteEhsMaterialDetailByMaterialId(materialId));

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