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

src/main/java/com/xjrsoft/module/room/dto/RoomBedCheckRecordPageDto.java

@@ -19,9 +19,11 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class RoomBedCheckRecordPageDto extends PageInput {
-
+    /**
+     * 班级编号
+     */
+    @ApiModelProperty("班级编号")
     private Long classId;
-
     /**
      * 查寝时间-开始
      */

src/main/java/com/xjrsoft/module/teacher/service/impl/WfTeacherleaveServiceImpl.java

@@ -61,7 +61,7 @@ public class WfTeacherleaveServiceImpl extends MPJBaseServiceImpl<WfTeacherleave
                  * 自动同步一条请假类型为“早自习、课间操”的数据到班主任事项请假列表。
                  */
                 if (dayOfWeekValue > 0 && dayOfWeekValue < 5
-                        && startTime.compareTo(forenoonStartDateTime) < 0
+                        && startTime.compareTo(forenoonEndDateTime) < 0
                         && endTime.compareTo(forenoonEndDateTime) > 0) {
 
                     wfHeadTeacherLeaveList.add(new WfHeadTeacherLeave(){{
@@ -92,7 +92,7 @@ public class WfTeacherleaveServiceImpl extends MPJBaseServiceImpl<WfTeacherleave
                  * 自动同步一条请假类型为“学生放假”的数据到班主任事项请假列表。
                  */
                 if (dayOfWeekValue == 5
-                        && startTime.compareTo(afternoonStartDateTime) < 0
+                        && startTime.compareTo(afternoonEndDateTime) < 0
                         && endTime.compareTo(afternoonEndDateTime) > 0) {
                     WfHeadTeacherLeave wfHeadTeacherLeave = new WfHeadTeacherLeave();
 

src/main/java/com/xjrsoft/module/textbook/controller/TextbookStudentClaimController.java

@@ -139,11 +139,15 @@ public class TextbookStudentClaimController {
     @PutMapping("/teacher-confirm")
     @ApiOperation(value = "教师帮助学生确认已经领取")
     @SaCheckPermission("textbookstudentclaim:edit")
-    public RT<Boolean> teacherConfirm(@Valid @RequestBody TeacherConfirmDto dto){
-        TextbookStudentClaim textbookStudentClaim = BeanUtil.toBean(dto, TextbookStudentClaim.class);
-        textbookStudentClaim.setIsClaim(1);
-        textbookStudentClaim.setRemark(dto.getRemark());
-        return RT.ok(textbookStudentClaimService.updateById(textbookStudentClaim));
+    public RT<Boolean> teacherConfirm(@Valid @RequestBody List<TeacherConfirmDto> teacherConfirmDtoList){
+        for (TeacherConfirmDto dto : teacherConfirmDtoList) {
+            TextbookStudentClaim textbookStudentClaim = BeanUtil.toBean(dto, TextbookStudentClaim.class);
+            textbookStudentClaim.setId(dto.getTextbookStudentClaimId());
+            textbookStudentClaim.setIsClaim(1);
+            textbookStudentClaim.setRemark(dto.getRemark());
+            textbookStudentClaimService.updateById(textbookStudentClaim);
+        }
+        return RT.ok(true);
     }
 
     @DeleteMapping

src/test/java/com/xjrsoft/module/teacher/service/impl/WfTeacherleaveServiceImplTest.java

@@ -19,6 +19,6 @@ class WfTeacherleaveServiceImplTest {
 
     @Test
     void dataHandle() {
-        wfTeacherleaveService.dataHandle(1738016970903244800L);
+        wfTeacherleaveService.dataHandle(1742734746853634048L);
     }
 }