Merge remote-tracking branch 'origin/master'

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>

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));