Просмотр исходного кода

出勤率百分比计算调整

dzx 1 год назад
Родитель
Сommit
5d3a6c4f25

+ 2 - 2
src/main/java/com/xjrsoft/module/attendance/controller/StatisticsController.java

@@ -113,7 +113,7 @@ public class StatisticsController {
             statisticsVo.setAbsenteeismCount(statisticsVo.getAllCount() - statisticsVo.getLeaveCount() - statisticsVo.getActualCount());
             statisticsVo.setAbsenteeismCount(statisticsVo.getAllCount() - statisticsVo.getLeaveCount() - statisticsVo.getActualCount());
 
 
             //计算出勤率
             //计算出勤率
-            BigDecimal divide = BigDecimal.valueOf(statisticsVo.getActualCount()).divide(BigDecimal.valueOf(statisticsVo.getAllCount()), 2, RoundingMode.HALF_UP);
+            BigDecimal divide = BigDecimal.valueOf(statisticsVo.getActualCount()).divide(BigDecimal.valueOf(statisticsVo.getAllCount()), 4, RoundingMode.HALF_UP);
             statisticsVo.setAttendanceRate(divide.doubleValue());
             statisticsVo.setAttendanceRate(divide.doubleValue());
         }
         }
 
 
@@ -179,7 +179,7 @@ public class StatisticsController {
             statisticsVo.setAbsenteeismCount(statisticsVo.getAllCount() - statisticsVo.getLeaveCount() - statisticsVo.getActualCount());
             statisticsVo.setAbsenteeismCount(statisticsVo.getAllCount() - statisticsVo.getLeaveCount() - statisticsVo.getActualCount());
 
 
             //计算出勤率
             //计算出勤率
-            BigDecimal divide = BigDecimal.valueOf(statisticsVo.getActualCount()).divide(BigDecimal.valueOf(statisticsVo.getAllCount()), 2, RoundingMode.HALF_UP);
+            BigDecimal divide = BigDecimal.valueOf(statisticsVo.getActualCount()).divide(BigDecimal.valueOf(statisticsVo.getAllCount()), 4, RoundingMode.HALF_UP);
             statisticsVo.setAttendanceRate(divide.doubleValue());
             statisticsVo.setAttendanceRate(divide.doubleValue());
         }
         }
 
 

+ 3 - 3
src/main/java/com/xjrsoft/module/attendance/controller/StudentStatisticsController.java

@@ -122,7 +122,7 @@ public class StudentStatisticsController {
                 record.setAbsenteeismCount(record.getStudentCount() - record.getLeaveCount() - record.getActualCount());
                 record.setAbsenteeismCount(record.getStudentCount() - record.getLeaveCount() - record.getActualCount());
 
 
                 //计算出勤率
                 //计算出勤率
-                BigDecimal divide = BigDecimal.valueOf(record.getActualCount()).divide(BigDecimal.valueOf(record.getStudentCount()), 2, RoundingMode.HALF_UP);
+                BigDecimal divide = BigDecimal.valueOf(record.getActualCount()).divide(BigDecimal.valueOf(record.getStudentCount()), 4, RoundingMode.HALF_UP);
                 record.setAttendanceRate(divide.doubleValue());
                 record.setAttendanceRate(divide.doubleValue());
             }
             }
         }
         }
@@ -257,7 +257,7 @@ public class StudentStatisticsController {
                 record.setAbsenteeismCount(record.getStudentCount() - record.getLeaveCount() - record.getActualCount());
                 record.setAbsenteeismCount(record.getStudentCount() - record.getLeaveCount() - record.getActualCount());
 
 
                 //计算出勤率
                 //计算出勤率
-                BigDecimal divide = BigDecimal.valueOf(record.getActualCount()).divide(BigDecimal.valueOf(record.getStudentCount()), 2, RoundingMode.HALF_UP);
+                BigDecimal divide = BigDecimal.valueOf(record.getActualCount()).divide(BigDecimal.valueOf(record.getStudentCount()), 4, RoundingMode.HALF_UP);
                 record.setAttendanceRate(divide.doubleValue());
                 record.setAttendanceRate(divide.doubleValue());
             }
             }
         }
         }
@@ -328,7 +328,7 @@ public class StudentStatisticsController {
                 record.setAbsenteeismCount(record.getStudentCount() - record.getLeaveCount() - record.getActualCount());
                 record.setAbsenteeismCount(record.getStudentCount() - record.getLeaveCount() - record.getActualCount());
 
 
                 //计算出勤率
                 //计算出勤率
-                BigDecimal divide = BigDecimal.valueOf(record.getActualCount()).divide(BigDecimal.valueOf(record.getStudentCount()), 2, RoundingMode.HALF_UP);
+                BigDecimal divide = BigDecimal.valueOf(record.getActualCount()).divide(BigDecimal.valueOf(record.getStudentCount()), 4, RoundingMode.HALF_UP);
                 record.setAttendanceRate(divide.doubleValue());
                 record.setAttendanceRate(divide.doubleValue());
             }
             }
         }
         }