Bladeren bron

update 学生增加服务指标,运营指标标记

周箭河 5 jaren geleden
bovenliggende
commit
fd136b3c85

+ 9 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/Practice4OrganDto.java

@@ -27,6 +27,7 @@ public class Practice4OrganDto {
     private Integer change4MonthNum = 0;
     @ApiModelProperty(value = "当月回款金额",required = false)
     private BigDecimal totalMoney = BigDecimal.ZERO;
+    private Double scale =  0.00;
 
     private String studentIds;
     public String getOrganName() {
@@ -124,4 +125,12 @@ public class Practice4OrganDto {
     public void setTotalNum(Integer totalNum) {
         this.totalNum = totalNum;
     }
+
+    public Double getScale() {
+        return scale;
+    }
+
+    public void setScale(Double scale) {
+        this.scale = scale;
+    }
 }

+ 6 - 1
mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -661,10 +661,15 @@ public class StudentOrderController extends BaseController {
                 }
             }
 
+            if (practice4OrganDto.getTryNum() > 0) {
+                double scale = new BigDecimal(practice4OrganDto.getTotalNum()).multiply(new BigDecimal(100)).divide(new BigDecimal(practice4OrganDto.getTryNum()), 2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                practice4OrganDto.setScale(scale);
+            }
+
             practice4Organs.add(practice4OrganDto);
         }
 
-        practice4Organs = practice4Organs.stream().sorted(Comparator.comparing(Practice4OrganDto::getTotalNum).reversed()).collect(Collectors.toList());
+        practice4Organs = practice4Organs.stream().sorted(Comparator.comparingDouble(Practice4OrganDto::getScale).reversed()).collect(Collectors.toList());
         return succeed(practice4Organs);
     }
 }