Browse Source

班级考勤统计调整

dzx 8 months ago
parent
commit
9f25219e82

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

@@ -128,7 +128,7 @@ public class StatisticsController {
             if(statisticsVo.getAllCount() != null && statisticsVo.getAllCount() != 0){
                 divide = BigDecimal.valueOf(statisticsVo.getActualCount()).divide(BigDecimal.valueOf(statisticsVo.getAllCount()), 4, RoundingMode.HALF_UP);
             }
-            statisticsVo.setAttendanceRate(divide.doubleValue());
+            statisticsVo.setAttendanceRate(divide.doubleValue() + "");
         }
 
         return RT.ok(statisticsVo);
@@ -201,9 +201,9 @@ public class StatisticsController {
                 //最后通过总人数-实到人数-请假人数计算出缺勤人数
                 statisticsVo.setAbsenteeismCount(statisticsVo.getAllCount() - statisticsVo.getLeaveCount() - statisticsVo.getActualCount());
                 BigDecimal divide = BigDecimal.valueOf(statisticsVo.getActualCount()).divide(BigDecimal.valueOf(statisticsVo.getAllCount()), 4, RoundingMode.HALF_UP);
-                statisticsVo.setAttendanceRate(divide.doubleValue());
+                statisticsVo.setAttendanceRate(divide.doubleValue() + "");
             }else{
-                statisticsVo.setAttendanceRate(0D);
+                statisticsVo.setAttendanceRate("0");
                 statisticsVo.setAbsenteeismCount(0L);
             }
 

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

@@ -151,7 +151,7 @@ public class StudentStatisticsController {
                 if(record.getStudentCount() != null && record.getStudentCount() != 0){
                     divide = BigDecimal.valueOf(record.getActualCount()).divide(BigDecimal.valueOf(record.getStudentCount()), 4, RoundingMode.HALF_UP);
                 }
-                record.setAttendanceRate(divide.doubleValue());
+                record.setAttendanceRate(divide.doubleValue() + "");
             }
         }
         PageOutput<ClassStatisticsVo> pageOutput = ConventPage.getPageOutput(attendancePage, ClassStatisticsVo.class);
@@ -302,7 +302,7 @@ public class StudentStatisticsController {
                 if(record.getStudentCount() != null && record.getStudentCount() != 0){
                     divide = BigDecimal.valueOf(record.getActualCount()).divide(BigDecimal.valueOf(record.getStudentCount()), 4, RoundingMode.HALF_UP);
                 }
-                record.setAttendanceRate(divide.doubleValue());
+                record.setAttendanceRate(divide.doubleValue() + "");
             }
         }
         PageOutput<ClassStatisticsVo> pageOutput = ConventPage.getPageOutput(attendancePage, ClassStatisticsVo.class);
@@ -376,7 +376,7 @@ public class StudentStatisticsController {
 
                 //计算出勤率
                 BigDecimal divide = BigDecimal.valueOf(record.getActualCount()).divide(BigDecimal.valueOf(record.getStudentCount()), 4, RoundingMode.HALF_UP);
-                record.setAttendanceRate(divide.doubleValue());
+                record.setAttendanceRate(divide.doubleValue() + "");
             }
         }
         PageOutput<ClassStatisticsVo> pageOutput = ConventPage.getPageOutput(attendancePage, ClassStatisticsVo.class);

+ 1 - 1
src/main/java/com/xjrsoft/module/attendance/vo/ClassStatisticsVo.java

@@ -46,7 +46,7 @@ public class ClassStatisticsVo {
     private Integer absenteeismCount;
 
     @ApiModelProperty("出勤率")
-    private Double attendanceRate;
+    private String attendanceRate;
 
     @ApiModelProperty("应该离校人数")
     private Integer ygLeaveSchoolCount;

+ 1 - 1
src/main/java/com/xjrsoft/module/attendance/vo/StudentStatisticsVo.java

@@ -36,6 +36,6 @@ public class StudentStatisticsVo {
     private Long absenteeismCount;
 
     @ApiModelProperty("出勤率")
-    private Double attendanceRate;
+    private String attendanceRate;
 
 }

+ 1 - 1
src/main/java/com/xjrsoft/module/attendance/vo/TeacherStatisticsVo.java

@@ -36,7 +36,7 @@ public class TeacherStatisticsVo {
     private Long absenteeismCount;
 
     @ApiModelProperty("出勤率")
-    private Double attendanceRate;
+    private String attendanceRate;
 
     @ApiModelProperty("旷课人数")
     private Integer playTruantCount;

+ 1 - 1
src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 spring:
   # 环境 dev|pre|prod
   profiles:
-    active: prod
+    active: pre
   # jackson时间格式化
   jackson:
     time-zone: GMT+8