Merge remote-tracking branch 'origin/dev'

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

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();
     }