代码提交

liusheng

3 天以前 e6456d2196b3e57bd06be0fbc74dd3e0fc28fdeb

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java

@@ -109,7 +109,8 @@
                }
            }
        }
        Collections.sort(serviceSubtaskDetailSET, Comparator.comparingLong(ServiceSubtaskDetail::getTemplatequestionnum));
        Collections.sort(serviceSubtaskDetailSET,
                Comparator.comparing(ServiceSubtaskDetail::getTemplatequestionnum, Comparator.nullsLast(Long::compareTo)));
        map1.put("filteredDetails", serviceSubtaskDetailSET);

        map1.put("voice", "");
@@ -246,7 +247,6 @@
            Long totalCount = serviceSubtaskDetailTargets.stream().filter(target -> target.getMatchedtext() == null || target.getMatchedtext().isEmpty()).mapToLong(target -> target.getCount() != null ? target.getCount() : 0) // 确保 count 为 0 如果为 null
                    .sum();


            Long allShowCount = 0L;

            // 遍历列表，将 matchedText 为""赋值给 null
@@ -272,7 +272,8 @@
                target.setTargetShowCount(allShowCount.toString());
                BigDecimal count = new BigDecimal(target.getCount() != null ? target.getCount().toString() : "0");
                BigDecimal allCount = new BigDecimal(allShowCount.toString());
                target.setPercentage(count.divide(allCount, 2, RoundingMode.HALF_UP).toString());
                if (allCount.compareTo(BigDecimal.ZERO) == 0)
                    target.setPercentage(count.divide(allCount, 2, RoundingMode.HALF_UP).toString());
            }
        }