From 3eff952ad6082d1022130f853f1d5a2e7cffc801 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Mon, 13 May 2024 20:59:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E5=9B=BE=E6=AF=94=E4=BE=8B-?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/mapper/xml/QualityInspectionRecordMapper.xml        | 2 +-
 .../service/impl/QualityInspectionRecordServiceImpl.java        | 2 +-
 .../entity/vo/XzSecurityQualityInspectionRecordTotalVo.java     | 2 +-
 .../mapper/xml/XzSecurityQualityInspectionRecordMapper.xml      | 2 +-
 .../XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
index f97958ee2..f2d4a94f8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
@@ -667,7 +667,7 @@
     <select id="riskChart"
             resultType="com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityQualityInspectionRecordTotalVo">
         select
-        ifnull(round((t2.dangerNum-t1.dangerNum)/t1.dangerNum*100,2),0) as monthlyBasis,
+        ifnull(round((t2.dangerNum-t1.dangerNum)/t1.dangerNum*100,2),'-') as monthlyBasis,
         t2.*
         from (
         <include refid="selectTotal">
diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java
index c65c66c36..a413b1817 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java
@@ -638,7 +638,7 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
                 vo.setGeneralRiskNum(0);
                 vo.setLargerRiskNum(0);
                 vo.setWhichWeekOfMonth(0);
-                vo.setMonthlyBasis(0.0D);
+                vo.setMonthlyBasis("0");
             }
             vo.setLastMonth(DateUtil.month(DateUtil.parse(month, "yyyy-MM")) + "月");
             rsList.add(vo);
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java
index 16d4cb8ff..1c229675c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java
@@ -61,6 +61,6 @@ public class XzSecurityQualityInspectionRecordTotalVo {
     @ApiModelProperty(value = "上个月名称")
     private String lastMonth;
     @ApiModelProperty(value = "月环比")
-    private Double monthlyBasis;
+    private String monthlyBasis;
 
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
index e18edc040..e4dfae796 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
@@ -672,7 +672,7 @@
     <select id="riskChart"
             resultType="com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityQualityInspectionRecordTotalVo">
         select
-        ifnull(round((t2.dangerNum-t1.dangerNum)/t1.dangerNum*100,2),0) as monthlyBasis,
+        ifnull(round((t2.dangerNum-t1.dangerNum)/t1.dangerNum*100,2),'-') as monthlyBasis,
         t2.*
         from (
         <include refid="selectTotal">
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java
index 0fbe9f4e1..325bd41b7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java
@@ -800,7 +800,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
                 vo.setGeneralRiskNum(0);
                 vo.setLargerRiskNum(0);
                 vo.setWhichWeekOfMonth(0);
-                vo.setMonthlyBasis(0.0D);
+                vo.setMonthlyBasis("-");
             }
             vo.setLastMonth(DateUtil.month(DateUtil.parse(month, "yyyy-MM")) + "月");
             rsList.add(vo);