|
@@ -1007,15 +1007,15 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
|
|
|
dto.setAvgBuyAmount(avgBuyAmount);
|
|
|
}
|
|
|
if(dto.getTotalNum() > 0 && dto.getBuyNum() > 0){
|
|
|
- BigDecimal buyScale = new BigDecimal(dto.getBuyNum()).divide(new BigDecimal(dto.getTotalNum()), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
|
|
|
+ BigDecimal buyScale = new BigDecimal(dto.getBuyNum()).divide(new BigDecimal(dto.getTotalNum()), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
|
|
|
dto.setBuyScale(buyScale);
|
|
|
}
|
|
|
if(dto.getTargetNum() > 0 && dto.getBuyNum() > 0){
|
|
|
- BigDecimal targetFinishScale = new BigDecimal(dto.getBuyNum()).divide(new BigDecimal(dto.getTargetNum()), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
|
|
|
+ BigDecimal targetFinishScale = new BigDecimal(dto.getBuyNum()).divide(new BigDecimal(dto.getTargetNum()), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
|
|
|
dto.setTargetFinishScale(targetFinishScale);
|
|
|
}
|
|
|
if(dto.getBuyAmount().doubleValue() > 0d && dto.getTargetAmount().doubleValue() > 0d){
|
|
|
- BigDecimal targetAmountFinishScale = dto.getBuyAmount().divide(dto.getTargetAmount(), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
|
|
|
+ BigDecimal targetAmountFinishScale = dto.getBuyAmount().divide(dto.getTargetAmount(), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
|
|
|
dto.setTargetAmountFinishScale(targetAmountFinishScale);
|
|
|
}
|
|
|
}
|
|
@@ -1043,11 +1043,11 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
|
|
|
// resultMap.put("buyScale",buyScale);
|
|
|
// }
|
|
|
if(targetNum > 0 && buyNum > 0){
|
|
|
- BigDecimal targetFinishScale = new BigDecimal(buyNum).divide(new BigDecimal(targetNum), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
|
|
|
+ BigDecimal targetFinishScale = new BigDecimal(buyNum).divide(new BigDecimal(targetNum), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
|
|
|
resultMap.put("targetFinishScale",targetFinishScale);
|
|
|
}
|
|
|
if(buyAmount.doubleValue() > 0d && targetAmount.doubleValue() > 0d){
|
|
|
- BigDecimal targetAmountFinishScale = buyAmount.divide(targetAmount, CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
|
|
|
+ BigDecimal targetAmountFinishScale = buyAmount.divide(targetAmount, CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
|
|
|
resultMap.put("targetAmountFinishScale",targetAmountFinishScale);
|
|
|
}
|
|
|
Map<String,Object> result = new HashMap<>(2);
|