大屏开发

platform-dao/src/main/java/com/platform/dao/mapper/hidden/HiddenDangerMapper.java

@@ -23,4 +23,6 @@ public interface HiddenDangerMapper extends MyMapper<HiddenDanger> {
      */
     List<HiddenDangerVO> selectList(HiddenDangerDTO dto);
 
+    Integer countNum(HiddenDangerDTO model);
+
 }

platform-dao/src/main/resources/mapper/hidden/HiddenDangerMapper.xml

@@ -137,4 +137,19 @@
             <include refid="List_Condition"/>
         </where>
     </select>
+
+    <select id="countNum" parameterType="com.platform.dao.dto.hidden.HiddenDangerDTO" resultType="java.lang.Integer">
+        select count(1) from t_hidden_danger
+        <where>
+            <if test="statusList != null and statusList.size > 0">
+                AND hidden.status in
+                <foreach item="item" index="index" collection="statusList" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="positionId != null and positionId != ''">
+                and position_id = #{positionId}
+            </if>
+        </where>
+    </select>
 </mapper>

platform-service/src/main/java/com/platform/service/workplace/impl/IndexServiceImpl.java

@@ -2,12 +2,11 @@ package com.platform.service.workplace.impl;
 
 import com.platform.common.constant.CommonConstants;
 import com.platform.common.util.*;
+import com.platform.dao.dto.hidden.HiddenDangerDTO;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
-import com.platform.dao.enums.RepairApplicationFormStatusEnum;
-import com.platform.dao.enums.RepairCategoryEnum;
-import com.platform.dao.enums.SbUseType;
-import com.platform.dao.enums.YesNoEnum;
+import com.platform.dao.enums.*;
+import com.platform.dao.mapper.hidden.HiddenDangerMapper;
 import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.vo.repair.IndexStatisticVO;
 import com.platform.dao.vo.repair.RepairApplicationFormVO;
@@ -36,6 +35,8 @@ public class IndexServiceImpl implements IndexService {
     private SparePartInfoService sparePartInfoService;
     @Resource
     private SbInfoMapper sbInfoMapper;
+    @Resource
+    private HiddenDangerMapper hiddenDangerMapper;
 
 
     @Override
@@ -167,7 +168,16 @@ public class IndexServiceImpl implements IndexService {
         Integer waitBgclNum = sbInfoMapper.countNum(sbQuery); // 待检定数量
         vo.setSpecialCompleteRate(BigDecimalUtil.divPercent(new BigDecimal(bgclTotal - waitBgclNum),vo.getCalculateSbNum(),2));
         // 隐患和转维修率
-
+        HiddenDangerDTO hiddenQuery = new HiddenDangerDTO();
+        hiddenQuery.setPositionId(positionId);
+        Integer hiddenNum = hiddenDangerMapper.countNum(hiddenQuery); // 隐患任务总数
+        vo.setHiddenDangerNum(new BigDecimal(hiddenNum));
+        List<Integer> hiddenStatus = ListUtils.newArrayList();
+        hiddenStatus.add(HiddenDangerStatusEnum.FINISHED.getValue());
+        hiddenStatus.add(HiddenDangerStatusEnum.ON_GOING.getValue());
+        hiddenQuery.setStatusList(hiddenStatus);
+        Integer toRepairNum = hiddenDangerMapper.countNum(hiddenQuery);
+        vo.setHiddenDangerCompleteRate(BigDecimalUtil.divPercent(new BigDecimal(hiddenNum - toRepairNum),vo.getCalculateSbNum(),2));
         return r.setData(vo);
     }