fix bug

sop-business/src/main/java/com/qmth/sop/business/mapper/ServiceUnitAnalyseMapper.java

@@ -134,4 +134,11 @@ public interface ServiceUnitAnalyseMapper extends BaseMapper<TBService> {
             @Param(value = "leadId") Long leadId, @Param(value = "province") String province, @Param(value = "prList") List<String> processList,
             @Param(value = "supplierId") Long supplierId, @Param(value = "coordinatorId") Long coordinatorId,
             @Param(value = "roleType") SopRoleTypeEnum roleType, @Param(value = "type") String type, @Param(value = "fieldObj") String fieldObj);
+
+    /**
+     *
+     * @param serviceUnitId  服务单元ID
+     * @return  sop的数量
+     */
+    int countSopNum(@Param(value = "serviceUnitId") Long serviceUnitId);
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/ServiceUnitAnalyseServiceImpl.java

@@ -57,7 +57,8 @@ public class ServiceUnitAnalyseServiceImpl extends ServiceImpl<ServiceUnitAnalys
         //sop数量
         LambdaQueryWrapper<TBSopInfo> sopWrapper = new LambdaQueryWrapper<>();
         sopWrapper.eq(TBSopInfo::getServiceId, serviceUnitId);
-        int sopNum = tbSopInfoService.count(sopWrapper);
+        int sopNum = baseMapper.countSopNum(serviceUnitId);
+
         result.setSopNum(sopNum);
 
         //大区经理人数

sop-business/src/main/java/com/qmth/sop/business/service/impl/SopWarnMonitorServiceImpl.java

@@ -129,7 +129,7 @@ public class SopWarnMonitorServiceImpl extends ServiceImpl<SopWarnMonitorMapper,
         Map<String, List<SopWarnMonitorDetailResult>> map = filterWarnList.stream().collect(Collectors.groupingBy(SopWarnMonitorDetailResult::getFieldObj));
         for (WarnFieldEnum field : WarnFieldEnum.values()) {
             int warnNum = 0;
-            String ratio = "";
+            String ratio = "0.00%";
             //设置预警数量和占比
             if (map.containsKey(field.getTitle())) {
                 warnNum = map.get(field.getTitle()).size();

sop-business/src/main/resources/mapper/ServiceUnitAnalyseMapper.xml

@@ -239,5 +239,19 @@
         <include refid="sopByUserAllocationSql"/>
     </select>
 
+    <select id="countSopNum" resultType="java.lang.Integer" parameterType="java.lang.Long">
+        SELECT count(DISTINCT tbsi.sop_no) AS sopNum
+        FROM t_b_sop_info tbsi
+                 INNER JOIN t_b_crm tbc ON tbc.crm_no = tbsi.crm_no
+                 INNER JOIN t_b_service tbs ON tbs.id = tbsi.service_id
+                 INNER JOIN t_f_custom_flow_entity tfcfe ON tfcfe.CODE = tbsi.sop_no
+                 INNER JOIN t_f_flow_approve tffa ON tffa.flow_id = tfcfe.flow_id
+                 LEFT JOIN ACT_RU_TASK art ON art.PROC_INST_ID_ = tffa.flow_id
+                 INNER JOIN t_f_custom_flow tfcf ON tfcf.id = tfcfe.t_f_custom_flow_id
+                 INNER JOIN t_b_crm_detail tbcd ON tbcd.sop_no = tbsi.sop_no
+                 INNER JOIN sys_custom sc on sc.id = tbc.custom_id
+        WHERE tbsi.service_id = #{serviceUnitId}
+    </select>
+
 
 </mapper>