Pārlūkot izejas kodu

开学报到调整

dzx 10 mēneši atpakaļ
vecāks
revīzija
41c7ba370a

+ 2 - 2
src/main/java/com/xjrsoft/module/student/controller/StudentReportRecordController.java

@@ -380,8 +380,8 @@ public class StudentReportRecordController {
     @PostMapping(value = "/all-sign")
     @ApiOperation(value="变更已报到")
     @SaCheckPermission("studentreportrecord:detail")
-    public RT<Boolean> allSign(@Valid @RequestBody List<StudentReportSignDto> dtoList){
-        StudentReportRecord record = studentReportRecordService.getById(dtoList.get(0).getId());
+    public RT<Boolean> allSign(@Valid @RequestBody List<Long> dtoList){
+        StudentReportRecord record = studentReportRecordService.getById(dtoList.get(0));
         StudentReportPlan reportPlan = studentReportPlanService.getById(record.getStudentReportPlanId());
         LocalDateTime now = LocalDateTime.now();
         if(reportPlan.getStatus() != 1 || (now.isAfter(reportPlan.getStartTime()) && now.isBefore(reportPlan.getEndTime()))){

+ 1 - 1
src/main/java/com/xjrsoft/module/student/service/IStudentReportRecordService.java

@@ -42,7 +42,7 @@ public interface IStudentReportRecordService extends MPJBaseService<StudentRepor
     List<StudentReportRecordPlanPageVo> getPlanPageList(StudentReportRecordPageDto dto);
 
 
-    Boolean allSgin(List<StudentReportSignDto> dtoList);
+    Boolean allSgin(List<Long> dtoList);
 
     Boolean updateStduyStatus(StudentReportSignDto dto);
 }

+ 3 - 4
src/main/java/com/xjrsoft/module/student/service/impl/StudentReportRecordServiceImpl.java

@@ -11,7 +11,6 @@ import com.xjrsoft.common.enums.StudentChangeTypeEnum;
 import com.xjrsoft.common.enums.StudyStatusEnum;
 import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.service.IUserService;
-import com.xjrsoft.module.room.entity.RoomBed;
 import com.xjrsoft.module.student.dto.StudentReportRecordPageDto;
 import com.xjrsoft.module.student.dto.StudentReportRecordStatisticsDto;
 import com.xjrsoft.module.student.dto.StudentReportSignDto;
@@ -119,9 +118,9 @@ public class StudentReportRecordServiceImpl extends MPJBaseServiceImpl<StudentRe
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean allSgin(List<StudentReportSignDto> dtoList) {
-        for (StudentReportSignDto dto : dtoList) {
-            StudentReportRecord record = this.getById(dto.getId());
+    public Boolean allSgin(List<Long> dtoList) {
+        for (Long id : dtoList) {
+            StudentReportRecord record = this.getById(id);
             record.setModifyDate(new Date());
             record.setUserId(StpUtil.getLoginIdAsLong());
             record.setReportTime(new Date());