From 3db909135448300dfe3939460421048be2438745 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 19 一月 2026 14:39:32 +0800
Subject: [PATCH] 【市一】满意度统计优化

---
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index 37b6c64..82e5bc9 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -3069,7 +3069,7 @@
      * @return
      */
     @Override
-    @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
+//    @Cacheable(value = "getSfStatisticsScript", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
     public List<ServiceSubtaskStatistic> getSfStatisticsScript(ServiceSubtaskCountReq serviceSubtaskCountReq) {
         log.error("getSfStatisticsScript鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
         List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
@@ -3132,12 +3132,12 @@
                 BigDecimal finishedSum = new BigDecimal(0);
                 //瀹屾垚姣斾緥
                 Double finishedPercentage = null;
-                if(ObjectUtils.isNotEmpty(serviceSubtaskStatistic.getJoyAllCount())){
-                    finishedSum = new BigDecimal(serviceSubtaskStatistic.getJoyAllCount());
+                if(ObjectUtils.isNotEmpty(serviceSubtaskStatistic.getJoyCount())){
+                    finishedSum = new BigDecimal(serviceSubtaskStatistic.getJoyCount());
                 }
 
-                if(ObjectUtils.isNotEmpty(serviceSubtaskStatistic.getJoyCount())){
-                    sum = new BigDecimal(serviceSubtaskStatistic.getJoyCount());
+                if(ObjectUtils.isNotEmpty(serviceSubtaskStatistic.getJoyAllCount())){
+                    sum = new BigDecimal(serviceSubtaskStatistic.getJoyAllCount());
                 }
                 if(sum.intValue() != 0){
                     finishedPercentage = finishedSum.divide(sum, 2, RoundingMode.HALF_UP).doubleValue();

--
Gitblit v1.9.3