LY 定期培训

master/src/main/java/com/ruoyi/project/training/controller/TTrainingbccDeviceController.java

@@ -58,8 +58,10 @@ public class TTrainingbccDeviceController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TTrainingbccDevice tTrainingbccDevice)
     {
-      SysUser user = sysUserMapper.selectUserById(getUserId());
-        tTrainingbccDevice.setStaffId(user.getStaffId());
+        if (tTrainingbccDevice.getRegularId() == null) {
+            SysUser user = sysUserMapper.selectUserById(getUserId());
+            tTrainingbccDevice.setStaffId(user.getStaffId());
+        }
         startPage();
         List<TTrainingbccDevice> list = tTrainingbccDeviceService.selectTTrainingbccDeviceList(tTrainingbccDevice);
         for (TTrainingbccDevice t: list
@@ -255,7 +257,7 @@ public class TTrainingbccDeviceController extends BaseController
         TTrainingbccDevice t=   tTrainingbccDeviceService.selectTTrainingbccDeviceById(tTrainingbccDevice.getId());
         TTrainingbcc tTrainingbcc = tTrainingbccService.selectTTrainingbccById(t.getRegularId());
         t.setLearnTime(t.getLearnTime() +1);
-        if (tTrainingbcc.getTimerNeed() != null && tTrainingbcc.getTimerNeed() < t.getLearnTime()) {
+        if (tTrainingbcc.getTimerNeed() != null && tTrainingbcc.getTimerNeed() <= t.getLearnTime()) {
             t.setLearnState(1l);
         }
         return toAjax(tTrainingbccDeviceService.updateTTrainingbccDevice(t));

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

@@ -8,6 +8,8 @@ import java.util.List;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.framework.job.service.JobService;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
 import com.ruoyi.project.training.elearn.domain.TElPaperQu;
 import com.ruoyi.project.training.elearn.domain.TElPaperQuAnswer;
 import com.ruoyi.project.training.elearn.domain.TElQu;
@@ -56,7 +58,8 @@ public class TElPaperController extends BaseController
     private TElPaperQuAnswerMapper tElPaperQuAnswerMapper;
     @Resource
     private TElQuMapper tElQuMapper;
-
+    @Autowired
+    ISysUserService sysUserService;
     /**
      * 查询在线考试列表
      */
@@ -64,6 +67,11 @@ public class TElPaperController extends BaseController
     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);
+        }
         List<TElPaper> list = tElPaperService.selectTElPaperList(tElPaper);
         return getDataTable(list);
     }

master/src/main/java/com/ruoyi/project/training/elearn/domain/TElPaper.java

@@ -29,7 +29,7 @@ public class TElPaper extends BaseEntity
 
     /** 员工编号 */
     @Excel(name = "员工编号")
-    private Long staffId;
+    private String staffId;
 
     /** 考试id */
     @Excel(name = "考试id")
@@ -92,6 +92,10 @@ public class TElPaper extends BaseEntity
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createdate;
 
+    public String getStaffId() {
+        return staffId;
+    }
+
     /** 更新人 */
     @Excel(name = "更新人")
     private String updaterCode;
@@ -137,15 +141,11 @@ public class TElPaper extends BaseEntity
     {
         return userId;
     }
-    public void setStaffId(Long staffId)
-    {
+
+    public void setStaffId(String staffId) {
         this.staffId = staffId;
     }
 
-    public Long getStaffId()
-    {
-        return staffId;
-    }
     public void setExamId(Long examId)
     {
         this.examId = examId;
@@ -363,7 +363,6 @@ public class TElPaper extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("paperId", getPaperId())
             .append("userId", getUserId())
-            .append("staffId", getStaffId())
             .append("examId", getExamId())
             .append("title", getTitle())
             .append("totalTime", getTotalTime())

master/src/main/resources/mybatis/training/TTrainingbccDeviceMapper.xml

@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="trainingType != null and trainingType != ''">and t.training_type = #{trainingType}</if>
             and d.del_flag = 0
         </where>
-        <!-- 数据范围过滤 -->
+        order by d.exam_state, d.start_date
     </select>
 
     <select id="selectTTrainingbccDeviceById" parameterType="Long" resultMap="TTrainingbccDeviceResult">

master/src/main/resources/mybatis/training/TTrainingbccMapper.xml

@@ -60,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
+        order by d.years desc,d.course_startdate desc
         ${params.dataScope}
     </select>
 

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

@@ -26,14 +26,14 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
 
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -77,6 +77,7 @@
             @click="openFileDialog(scope.row)"
           >学习</el-button>
           <el-button
+            v-if="scope.row.learnState == 1"
             size="mini"
             type="text"
             icon="el-icon-edit"

ui/src/views/training/elearn/exam/index.vue

@@ -283,7 +283,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="handleSave">保 存</el-button>
         <el-button @click="cancel">取 消</el-button>
-      </div>-->
+      </div>
 <!--      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="考试名称" prop="title">
           <el-input v-model="form.title" placeholder="请输入考试名称" />

ui/src/views/training/elearn/userExam/paper.vue

@@ -33,6 +33,10 @@ export default {
     userId: {
       type: String,
       default: ''
+    },
+    staffId: {
+      type: String,
+      default: ''
     }
   },
 
@@ -68,7 +72,7 @@ export default {
   methods: {
 
     fetchPaperList() {
-      const param = {userId:this.userId ,examId: this.examId }
+      const param = {userId:this.userId ,examId: this.examId,staffId: this.staffId }
       listPaper(param).then(response => {
         this.paperList = response.rows
       })

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

@@ -26,15 +26,17 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          icon="el-icon-plus"
+          type="success"
+          icon="el-icon-edit"
           size="mini"
-          @click="handleAdd"
-        >新增</el-button>
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['training:training:edit']"
+        >{{ $t('修改') }}</el-button>
       </el-col>
-
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -97,9 +99,6 @@
         <el-form-item label="人员员工号" prop="staffId">
           <el-input v-model="form.staffId" placeholder="请输入人员员工号" />
         </el-form-item>
-        <el-form-item label="装置级培训ID" prop="regularId">
-          <el-input v-model="form.regularId" placeholder="请输入装置级培训ID" />
-        </el-form-item>
         <el-form-item label="开始日期" prop="startDate">
           <el-date-picker clearable size="small" style="width: 200px"
             v-model="form.startDate"
@@ -111,49 +110,12 @@
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="删除状态" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
-        </el-form-item>
-        <el-form-item label="创建人" prop="createrCode">
-          <el-input v-model="form.createrCode" placeholder="请输入创建人" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createdate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.createdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="修改人" prop="updaterCode">
-          <el-input v-model="form.updaterCode" placeholder="请输入修改人" />
-        </el-form-item>
-        <el-form-item label="修改时间" prop="updatedate">
-          <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.updatedate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择修改时间">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item label="是否为补培人员" prop="supplementary">
-          <el-input v-model="form.supplementary" placeholder="请输入是否为补培人员" />
-        </el-form-item>
-        <el-form-item label="学习状态" prop="learnState">
-          <el-input v-model="form.learnState" placeholder="请输入学习状态" />
-        </el-form-item>
-        <el-form-item label="考试状态" prop="examState">
-          <el-input v-model="form.examState" placeholder="请输入考试状态" />
-        </el-form-item>
-        <el-form-item label="考试ID" prop="examId">
-          <el-input v-model="form.examId" placeholder="请输入考试ID" />
+          <el-select v-model="form.supplementary" placeholder="是否为补培人员 ">
+            <el-option label="否" value="0" />
+            <el-option label="是" value="1" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="学习时长min" prop="learnTime">
-          <el-input v-model="form.learnTime" placeholder="请输入学习时长min" />
-        </el-form-item>
-          <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
-          </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -190,6 +152,13 @@
               <el-button @click="upload.open = false">取 消</el-button>
           </div>
       </el-dialog>
+    <el-dialog :visible.sync="detailOpen" title="考试明细" width="60%" append-to-body>
+
+      <div class="el-dialog-div">
+        <my-paper-list :exam-id="examId" :user-id="userId" :staff-id ="staffId" />
+      </div>
+
+    </el-dialog>
   </div>
 </template>
 
@@ -199,10 +168,11 @@ import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import MyPaperList from '@/views/training/elearn/userExam/paper'
 
 export default {
   name: "Device",
-  components: { Treeselect },
+  components: { Treeselect,MyPaperList },
   data() {
     return {
       // 遮罩层
@@ -226,6 +196,9 @@ export default {
       clientHeight:300,
       // 是否显示弹出层
       open: false,
+      detailOpen:false,
+      examId: null,
+      staffId: null,
         // 用户导入参数
         upload: {
             // 是否显示弹出层（用户导入）
@@ -431,6 +404,11 @@ export default {
       // 提交上传文件
       submitFileForm() {
           this.$refs.upload.submit();
+      },
+      hanldeExamPaper(row) {
+          this.examId = row.trainingbcc.examId
+          this.staffId = row.staffId
+          this.detailOpen = true
       }
   }
 };