Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/attendance/dto/AddAttendanceRuleDetailsDto.java

@@ -165,4 +165,17 @@ public class AddAttendanceRuleDetailsDto implements Serializable {
     @ApiModelProperty("考勤规则(attendance_rule_category)")
     private Long attendanceRuleCategoryId;
 
+    @ApiModelProperty("为节假日前一天时放学时间")
+    private LocalTime holidaysEndTime;
+
+
+    @ApiModelProperty("返校上学时间")
+    private LocalTime returnStartTime;
+
+    @ApiModelProperty("返校放学时间")
+    private LocalTime returnEndTime;
+
+    @ApiModelProperty("节假日迟到旷课时间")
+    private Integer holidaysLateMinutes;
+
 }

src/main/java/com/xjrsoft/module/attendance/service/impl/AttendanceRuleCategoryServiceImpl.java

@@ -163,6 +163,7 @@ public class AttendanceRuleCategoryServiceImpl extends MPJBaseServiceImpl<Attend
                     .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUser.class).contains(x.getProperty()))
                     .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, XjrUser::getId)
                     .eq(BaseStudentSchoolRoll::getDeleteMark, DeleteMark.NODELETE.getCode())
+                    .eq(BaseStudentSchoolRoll::getStduyStatus, dto.getStduyStatus())
                     .eq(XjrUser::getDeleteMark, DeleteMark.NODELETE.getCode())
                     .in(!classIds.isEmpty(), BaseStudentSchoolRoll::getClassId, classIds)
                     .in(!userIds.isEmpty(), XjrUser::getId, userIds)
@@ -356,6 +357,7 @@ public class AttendanceRuleCategoryServiceImpl extends MPJBaseServiceImpl<Attend
                     .select(XjrUser.class, x -> VoToColumnUtil.fieldsToColumns(XjrUser.class).contains(x.getProperty()))
                     .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, XjrUser::getId)
                     .eq(BaseStudentSchoolRoll::getDeleteMark, DeleteMark.NODELETE.getCode())
+                    .eq(BaseStudentSchoolRoll::getStduyStatus, dto.getStduyStatus())
                     .eq(XjrUser::getDeleteMark, DeleteMark.NODELETE.getCode())
                     .in(!classIds.isEmpty(), BaseStudentSchoolRoll::getClassId, classIds)
                     .in(!userIds.isEmpty(), XjrUser::getId, userIds)

src/main/java/com/xjrsoft/module/attendance/vo/AttendanceRuleDetailsVo.java

@@ -168,4 +168,13 @@ public class AttendanceRuleDetailsVo {
     @ApiModelProperty("为节假日前一天时放学时间")
     private LocalTime holidaysEndTime;
 
+    @ApiModelProperty("返校上学时间")
+    private LocalTime returnStartTime;
+
+    @ApiModelProperty("返校放学时间")
+    private LocalTime returnEndTime;
+
+    @ApiModelProperty("节假日迟到旷课时间")
+    private Integer holidaysLateMinutes;
+
 }