管城学校分支课堂优化

sclass/src/main/java/com/xhkjedu/sclass/controller/classroom/ClassroomController.java

@@ -167,7 +167,7 @@ public class ClassroomController {
                 }
             });
         });
-        return classroomService.batchSaveClass(startclassList, stopclassList, savefileList
+        return classroomService.batchSaveClass(rooms,startclassList, stopclassList, savefileList
                 , askteacherList, askstudentList, signList
                 , paperList, nodename, stupaperList, paperFileList, paperQtypeList, paperScantronList);
     }
@@ -287,7 +287,7 @@ public class ClassroomController {
                 stupaperList.add(student);
             }
         }
-        return classroomService.saveClass(startclass, stopclass, savefileList
+        return classroomService.saveClass(r,startclass, stopclass, savefileList
                 , askteacherList, askstudentList, signList
                 , paperList, nodename, stupaperList, paperFileList, paperQtypeList, paperScantronList);
     }

sclass/src/main/java/com/xhkjedu/sclass/service/classroom/ClassroomService.java

@@ -6,6 +6,7 @@ import com.xhkjedu.sclass.model.classroom.*;
 import com.xhkjedu.sclass.utils.ArithUtil;
 import com.xhkjedu.sclass.vo.classroom.*;
 import com.xhkjedu.sclass.vo.paper.CheckClassVo;
+import com.xhkjedu.sclass.vo.room.RoomPVo;
 import com.xhkjedu.sclass.vo.room.RoomParamVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
@@ -544,11 +545,11 @@ public class ClassroomService {
      * @Date 2022/6/28 16:51
      **/
     @Transactional(rollbackFor = Exception.class)
-    public ResultVo batchSaveClass(List<TClassroom> startclassList, List<TClassroom> stopclassList
+    public ResultVo batchSaveClass(List<RoomPVo> rooms,List<TClassroom> startclassList, List<TClassroom> stopclassList
             , List<TClassroomFile> savefileList
             , List<TClassroomAskteacher> askteacherList, List<TClassroomAskstudent> askstudentList
             , List<TClassroomSign> signList
-            , List<TClassroomPaper> paperList,String nodename, List<TClassroomPaperStudent> stupaperList
+            , List<TClassroomPaper> paperList, String nodename, List<TClassroomPaperStudent> stupaperList
             , List<TClassroomPaperFile> paperFileList, List<TClassroomPaperQtype> paperQtypeList
             , List<TClassroomPaperScantron> paperScantronList) {
         ResultVo resultVo = new ResultVo();
@@ -596,8 +597,9 @@ public class ClassroomService {
             resultVo.setMsg("保存成功");
         } catch (Exception e) {
             log.error("批量保存课堂数据失败：" + e.getMessage());
+            log.error(JSON.toJSONString(rooms));
             resultVo.setMsg("保存失败");
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new RuntimeException("保存失败");
         }
         return resultVo;
     }
@@ -727,7 +729,8 @@ public class ClassroomService {
      * @Author ywx
      * @Date 2022/6/30 11:12
      **/
-    public ResultVo saveClass(TClassroom startclass, TClassroom stopclass, List<TClassroomFile> savefileList
+    @Transactional(rollbackFor = Exception.class)
+    public ResultVo saveClass(RoomPVo r,TClassroom startclass, TClassroom stopclass, List<TClassroomFile> savefileList
             , List<TClassroomAskteacher> askteacherList, List<TClassroomAskstudent> askstudentList, List<TClassroomSign> signList
             , List<TClassroomPaper> paperList, String nodename
             , List<TClassroomPaperStudent> stupaperList, List<TClassroomPaperFile> paperFileList
@@ -775,8 +778,9 @@ public class ClassroomService {
             resultVo.setMsg("保存成功");
         } catch (Exception e) {
             log.error("批量保存课堂数据失败：" + e.getMessage());
+            log.error(JSON.toJSONString(r));
             resultVo.setMsg("保存失败");
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new RuntimeException("保存失败");
         }
         return resultVo;
     }