From b1765edef3930401e930f16ae5ed5579b6da16c8 Mon Sep 17 00:00:00 2001
From: liwen <w790785492@163.com>
Date: Wed, 17 Apr 2024 19:10:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=88=91=E7=9A=84=E6=A3=80=E4=BF=AE?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0is=5Fdele?=
 =?UTF-8?q?ted=E5=AD=97=E6=AE=B5=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml
index 9806a10..baa3ca2 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessTaskMapper.xml
@@ -247,6 +247,7 @@
         LEFT JOIN HZIMS_OPER_ACCESS_PLAN PLAN
         ON TASK.PLAN_ID = PLAN.ID
         <where>
+            TASK.IS_DELETED = 0
             <if test="taskName != null and taskName != ''">
                 AND TASK.`NAME` LIKE CONCAT('%',#{taskName},'%')
             </if>

From 5614c8ada838f8c7ec7e4c37a5bed9b05314c105 Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Wed, 17 Apr 2024 19:33:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=E6=9C=88=E6=8A=A5=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/operational/defect/service/impl/OperDefectServiceImpl.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java
index 5a8c70b..c4d2a06 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperDefectServiceImpl.java
@@ -1010,6 +1010,7 @@ public class OperDefectServiceImpl extends BaseServiceImpl<OperDefectMapper, Ope
             OperDefectRepeatRatioDTO addUp = OperDefectRepeatRatioDTO.builder().defectLevel("合计").happenNum(one.getHappenNum() + two.getHappenNum() + three.getHappenNum()).happenSumNum(one.getHappenSumNum() + two.getHappenSumNum() + three.getHappenSumNum()).happenRatio(1.0).repeatRatio(1.00).build();
             if (addUp.getHappenNum().equals(0L)) {
                 addUp.setRepeatRatio(0.0);
+                addUp.setHappenRatio(0.0);
             }
 
             re.addAll(Arrays.asList(one, two, three, addUp));