|
@@ -599,7 +599,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
|
|
|
}
|
|
|
if(organsNewCloudNewStudentNumMap.containsKey(organ.getId())){
|
|
|
organStudentVipData.setNewStudentNum(organsNewCloudNewStudentNumMap.get(organ.getId()));
|
|
|
- organStudentVipData.setNewStudentDuty(new BigDecimal(organStudentVipData.getNewStudentNum()).divide(new BigDecimal(organStudentVipData.getTotalStudentNum()), 4, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).floatValue());
|
|
|
+ if(organStudentVipData.getNewStudentNum() > 0 && organStudentVipData.getTotalStudentNum()>0){
|
|
|
+ organStudentVipData.setNewStudentDuty(new BigDecimal(organStudentVipData.getNewStudentNum()).divide(new BigDecimal(organStudentVipData.getTotalStudentNum()), 4, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).floatValue());
|
|
|
+ }
|
|
|
}
|
|
|
result.add(organStudentVipData);
|
|
|
}
|
|
@@ -704,7 +706,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
|
|
|
}
|
|
|
if(organsNewCloudNewStudentNumMap.containsKey(organ.getId())){
|
|
|
organStudentVipData.setNewStudentNum(organsNewCloudNewStudentNumMap.get(organ.getId()));
|
|
|
- if(organStudentVipData.getNewStudentNum() > 0){
|
|
|
+ if(organStudentVipData.getNewStudentNum() > 0 && organStudentVipData.getTotalStudentNum()>0){
|
|
|
organStudentVipData.setNewStudentDuty(new BigDecimal(organStudentVipData.getNewStudentNum()).divide(new BigDecimal(organStudentVipData.getTotalStudentNum()), 4, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).floatValue());
|
|
|
}
|
|
|
}
|