Merge remote-tracking branch 'origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

@@ -266,6 +266,12 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
             List<List<ScreenProjectDataDTO>> partition = ListUtils.partition(meta, NumConstant.ONE_HUNDRED);
             partition.forEach(part -> {
                 List<ScreenProjectDataEntity> list = ConvertUtils.sourceToTarget(part, ScreenProjectDataEntity.class);
+                // 把来源网格的，已结案的项目，满意度分默认设置80
+                list.forEach(l -> {
+                    if (l.getOrgType().equals("grid") && l.getProjectStatusCode().equals("closed_case")){
+                        l.setSatisfactionScore(new BigDecimal(NumConstant.EIGHTY));
+                    }
+                });
                 insertBatch(list);
                 saveCategory(customerId, list);
             });