zhaoq 5 hónapja
szülő
commit
fffb7fe55b

+ 5 - 2
tc-service/tap-task/src/main/java/com/minto/app/task/manager/TaskAnalysisManagerImpl.java

@@ -1583,9 +1583,12 @@ public class TaskAnalysisManagerImpl implements ITaskAnalysisManager{
         }
 
         Map<String, Object> caseProportionMap = taskTypeSettingManager.calculateCaseProportion(param);
-        caseProportionMap.put("c",caseProportionMap.get("allNum"));
+        String allNum = caseProportionMap.get("allNum").toString();
+        caseProportionMap.put("c", allNum);
         caseProportionMap.put("reachPer","-");
-        caseProportionMap.put("caseProportion","1:"+caseProportionMap.get("caseProportion"));
+        if (!"0".equals(allNum)){
+            caseProportionMap.put("caseProportion","1:"+caseProportionMap.get("caseProportion"));
+        }
         list.add(caseProportionMap);
 
         return list;

+ 3 - 1
tc-service/tap-task/src/main/java/com/minto/app/task/manager/TaskTypeSettingManagerImpl.java

@@ -165,7 +165,9 @@ public class TaskTypeSettingManagerImpl implements ITaskTypeSettingManager{
         List<Map<String, Object>> list = taskTypeSettingDao.findCaseProportion(param);
         if (!list.isEmpty()) {
             Map<String, Object> caseProportionMap = list.get(0);
-            BigDecimal caseProportion = new BigDecimal(caseProportionMap.get("caseProportionSum").toString()).divide(new BigDecimal(caseProportionMap.get("allNum").toString()), 1, BigDecimal.ROUND_HALF_UP);
+            String allNum = caseProportionMap.get("allNum").toString();
+            if ("0".equals(allNum)) return map;
+            BigDecimal caseProportion = new BigDecimal(caseProportionMap.get("caseProportionSum").toString()).divide(new BigDecimal(allNum), 1, BigDecimal.ROUND_HALF_UP);
             map.put("caseProportion",caseProportion);
             map.put("allNum",caseProportionMap.get("allNum"));
         }