From beb21b6b60681d851eab2a2e3de6d416bbf6dec3 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sun, 11 Jul 2021 13:43:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E4=BC=97=E4=B8=8D=E6=BB=A1=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/ScreenUserJoinDao.xml       |  4 ++--
 .../com/epmet/controller/DemoController.java  | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
index bdc4265ed7..5f6b3ab061 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenUserJoinDao.xml
@@ -31,10 +31,10 @@
             ifnull(sum(suj.JOIN_TOTAL),0) as total,
             0 as monthIncr,
             ''as monthTrend,
-            round(IFNULL(sum(suj.avg_issue_fz)/sum(suj.avg_issue_fm),0),6) as averageIssue,
+            round(IFNULL(sum(suj.avg_issue_fz)/sum(suj.avg_issue_fm),0),2) as averageIssue,
             0 as issueCompareLatestMonth,
             '' as issueCompareLatestTrend,
-            round(ifnull(sum(suj.avg_join_fz)/sum(suj.avg_join_fm),0),6)as averageJoin,
+            round(ifnull(sum(suj.avg_join_fz)/sum(suj.avg_join_fm),0),2)as averageJoin,
             0 as joinCompareLatestMonth,
             '' as joinCompareLatestTrend
         FROM
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index b0b1e80421..25e4b13876 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -46,6 +46,7 @@ import com.epmet.service.stats.DimAgencyService;
 import com.epmet.service.stats.DimCustomerPartymemberService;
 import com.epmet.service.stats.DimCustomerService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -956,12 +957,19 @@ public class DemoController {
      * @Date 2021/6/23 15:55
      **/
     @PostMapping("update-satisfaction-core")
-    public Result updateProjectSatisfactionScore(){
-        List<String> customerIds=dimCustomerService.getAllCustomerId();
-        customerIds.forEach(customerId->{
-            screenProjectSettleService.updateProjectSatisfactionScore(customerId,null,null);
-            log.info("更新完成");
-        });
+    public Result updateProjectSatisfactionScore(@RequestBody List<String> customerIdList){
+        if(CollectionUtils.isNotEmpty(customerIdList)){
+            customerIdList.forEach(customerId->{
+                screenProjectSettleService.updateProjectSatisfactionScore(customerId,null,null);
+                log.info("更新完成");
+            });
+        }else{
+            List<String> customerIds=dimCustomerService.getAllCustomerId();
+            customerIds.forEach(customerId->{
+                screenProjectSettleService.updateProjectSatisfactionScore(customerId,null,null);
+                log.info("更新完成");
+            });
+        }
         return new Result();
     }