ly 修改分页 学习时长

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsNewController.java

@@ -117,13 +117,13 @@ public class TTsNewController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('bccnew:tsnew:list')")
     @GetMapping("/list")
     public TableDataInfo list(TTsNew tTsNew) {
-        startPage();
         if ("1".equals(tTsNew.getIsStudent())) {
             tTsNew.setStaffId(getBaseStaffId());
         }
         if ("1".equals(tTsNew.getIsTeacher())) {
             tTsNew.setMentorStaffId(getBaseStaffId());
         }
+        startPage();
         List<TTsNew> list = tTsNewService.selectTTsNewList(tTsNew);
         //线程池
         ExecutorService executorService = Executors.newFixedThreadPool(10);

master/src/main/java/com/ruoyi/project/training/elearn/controller/TElPaperController.java

@@ -66,12 +66,12 @@ public class TElPaperController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TElPaper tElPaper)
     {
-        startPage();
         if (tElPaper.getUserId() == null && tElPaper.getStaffId()!=null) {
             SysUser user = this.sysUserService.selectUserByStaffId(tElPaper.getStaffId()+"");
             tElPaper.setUserId(user.getUserId());
             tElPaper.setStaffId(null);
         }
+        startPage();
         List<TElPaper> list = tElPaperService.selectTElPaperList(tElPaper);
         return getDataTable(list);
     }

master/src/main/java/com/ruoyi/project/training/elearn/controller/TElUserBookController.java

@@ -43,8 +43,8 @@ public class TElUserBookController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TElUserBook tElUserBook)
     {
-        startPage();
         tElUserBook.setUserId(getUserId());
+        startPage();
         List<TElUserBook> list = tElUserBookService.selectTElUserBookList(tElUserBook);
         return getDataTable(list);
     }

master/src/main/java/com/ruoyi/project/training/elearn/controller/TElUserQuController.java

@@ -3,6 +3,7 @@ package com.ruoyi.project.training.elearn.controller;
 import java.util.Date;
 import java.util.List;
 
+import com.github.pagehelper.PageHelper;
 import com.ruoyi.project.training.elearn.domain.TElQu;
 import com.ruoyi.project.training.elearn.domain.TElQuRepo;
 import com.ruoyi.project.training.elearn.domain.TElUserBook;
@@ -146,6 +147,8 @@ public class TElUserQuController extends BaseController
             book.setQuId(tElUserQu.getQuId());
             tElUserBookMapper.deleteTElUserBookByQuId(book);
         }
+        // 确保分页状态被清除
+        PageHelper.clearPage();
         return toAjax(tElUserQuService.insertTElUserQu(tElUserQu));
     }
 

master/src/main/java/com/ruoyi/project/training/mapper/TElUserQuMapper.java

@@ -26,7 +26,6 @@ public interface TElUserQuMapper
      * @param tElUserQu 答题记录
      * @return 答题记录集合
      */
-    @DataScope(deptAlias = "d")
     public List<TElUserQu> selectTElUserQuList(TElUserQu tElUserQu);
 
     /**

master/src/main/resources/mybatis/training/elearn/TElUserQuMapper.xml

@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </selectKey>
         insert into t_el_user_qu
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
+            id,
             <if test="userId != null">user_id,</if>
             <if test="examId != null">exam_id,</if>
             <if test="quId != null">qu_id,</if>
@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isRight != null">is_right,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
+            #{id},
             <if test="userId != null">#{userId},</if>
             <if test="examId != null">#{examId},</if>
             <if test="quId != null">#{quId},</if>

ui/src/views/training/bccdevice/index.vue

@@ -55,20 +55,22 @@
           <span v-else-if="scope.row.supplementary == 1" size="small" type="info">是</span>
         </template>
       </el-table-column>
-      <el-table-column label="学习状态" align="center" prop="learnState" width="120" :show-overflow-tooltip="true">
+      <el-table-column label="学习状态" align="center" prop="learnState" width="100" :show-overflow-tooltip="true">
         <template v-slot="scope">
           <el-tag v-if="scope.row.learnState == 1" size="small" type="success">已完成</el-tag>
           <el-tag v-else-if="scope.row.learnState == 0"  size="small" type="info">未完成</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="考试状态" align="center" prop="examState" width="120" :show-overflow-tooltip="true">
+
+      <el-table-column label="需学习时长min" align="center" prop="trainingbcc.timerNeed" width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="已学习时长min" align="center" prop="learnTime" width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="考试状态" align="center" prop="examState" width="100" :show-overflow-tooltip="true">
         <template v-slot="scope">
           <el-tag v-if="scope.row.examState == 1" size="small" type="success">合格</el-tag>
           <el-tag v-else-if="scope.row.examState == 0" size="small" type="info">未完成</el-tag>
           <el-tag v-else-if="scope.row.examState == -1" size="small" type="danger">不合格</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="学习时长min" align="center" prop="learnTime" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template v-if="scope.row.isLock != 1"  slot-scope="scope">
           <el-button

ui/src/views/training/trainingbcc/deviceList.vue

@@ -57,15 +57,17 @@
           <span v-else-if="scope.row.supplementary == 1" size="small" type="info">是</span>
         </template>
       </el-table-column>
-      <el-table-column label="学习状态" align="center" prop="learnState" width="120" :show-overflow-tooltip="true">
+      <el-table-column label="学习状态" align="center" prop="learnState" width="100" :show-overflow-tooltip="true">
         <template v-slot="scope">
           <el-tag v-if="scope.row.learnState == 1" size="small" type="success">已完成</el-tag>
           <el-tag v-else-if="scope.row.learnState == 0"  size="small" type="info">未完成</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="学习时长min" align="center" prop="learnTime" width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="需学习时长min" align="center" prop="trainingbcc.timerNeed" width="120" :show-overflow-tooltip="true"/>
 
-      <el-table-column label="考试状态" align="center" prop="examState" width="120" :show-overflow-tooltip="true">
+      <el-table-column label="已学习时长min" align="center" prop="learnTime" width="120" :show-overflow-tooltip="true"/>
+
+      <el-table-column label="考试状态" align="center" prop="examState" width="100" :show-overflow-tooltip="true">
         <template v-slot="scope">
           <el-tag v-if="scope.row.examState == 1" size="small" type="success">合格</el-tag>
           <el-tag v-else-if="scope.row.examState == 0" size="small" type="info">未完成</el-tag>