ly 培训跟踪

master/pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.cpms</groupId>
     <artifactId>cpms</artifactId>
     <version>3.2.0</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
 
     <name>cpms</name>
     <description>cpms管理系统</description>

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

@@ -74,6 +74,7 @@ public class TTrainingbccDeviceController extends BaseController
              ) {
           TTrainingbcc tTrainingbcc = tTrainingbccService.selectTTrainingbccById(t.getRegularId());
           t.setTrainingbcc(tTrainingbcc);
+          t.setStartDate(tTrainingbcc.getCourseStartdate());
           // 判断是否过期
             t.setIsLock(0);
             if (tTrainingbcc.getCourseEnddate()!=null) {

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

@@ -66,7 +66,6 @@ public class TElLearnController extends BaseController
     /**
      * 查询在线学习记录列表
      */
-    @PreAuthorize("@ss.hasPermi('elearn:learn:list')")
     @GetMapping("/list")
     public AjaxResult list(TElLearn tElLearn)
     {
@@ -89,7 +88,6 @@ public class TElLearnController extends BaseController
     /**
      * 获取在线学习记录详细信息
      */
-    @PreAuthorize("@ss.hasPermi('elearn:learn:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -99,7 +97,6 @@ public class TElLearnController extends BaseController
     /**
      * 新增在线学习记录
      */
-    @PreAuthorize("@ss.hasPermi('elearn:learn:add')")
     @Log(title = "在线学习记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TElLearn tElLearn)
@@ -110,7 +107,6 @@ public class TElLearnController extends BaseController
     /**
      * 修改在线学习记录
      */
-    @PreAuthorize("@ss.hasPermi('elearn:learn:edit')")
     @Log(title = "在线学习记录", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TElLearn tElLearn)
@@ -121,7 +117,6 @@ public class TElLearnController extends BaseController
     /**
      * 删除在线学习记录
      */
-    @PreAuthorize("@ss.hasPermi('elearn:learn:remove')")
     @Log(title = "在线学习记录", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/training/elearn/service/impl/TElPaperServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.project.training.elearn.service.impl;
 
 import com.ruoyi.framework.job.service.JobService;
+import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.mapper.SysUserMapper;
 import com.ruoyi.project.training.bccnew.domain.TTsFirstplan;
@@ -17,6 +18,8 @@ import com.ruoyi.project.training.mapper.TTrainingbccDeviceMapper;
 import com.ruoyi.project.training.mapper.TTrainingbccMapper;
 import com.ruoyi.project.training.service.ITTrainingbccDeviceService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,7 +44,7 @@ public class TElPaperServiceImpl implements ITElPaperService {
             "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X"
             , "Y", "Z"
     });
-
+    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
     @Resource
     private TElPaperMapper tElPaperMapper;
     @Resource
@@ -361,6 +364,8 @@ public class TElPaperServiceImpl implements ITElPaperService {
             new Thread(() -> {
 
                 TTrainingbcc param = new TTrainingbcc();
+                logger.info("===================" + paper.getExamId());
+                logger.info("++++++++++++++++++++++" + exam.getExamId());
                 param.setExamId(paper.getExamId());
                 List<TTrainingbcc> tTrainingbccList = tTrainingbccMapper.selectTTrainingbccList(param);
                 if (!CollectionUtils.isEmpty(tTrainingbccList)) {
@@ -376,7 +381,7 @@ public class TElPaperServiceImpl implements ITElPaperService {
                                 long pass = objScore >= paper.getQualifyScore() ? 1 : 0;
                                 d.setExamState(pass);
                                 d.setExamNum(d.getExamNum()+ 1);
-                                if (d.getExamNum()+ 1 >= 5) {
+                                if (d.getExamNum() >= 5) {
                                     d.setExamState(-1l);
                                 }
                                 d.setExamDate(new Date());

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

@@ -57,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="trainer != null  and trainer != ''"> and trainer = #{trainer}</if>
             <if test="position != null  and position != ''"> and position = #{position}</if>
             <if test="trainingType != null and trainingType != ''">and training_type = #{trainingType}</if>
+            <if test="examId != null and examId != ''">and exam_id = #{examId}</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

ui/src/views/system/user/profile/resetPwd.vue

@@ -1,13 +1,13 @@
 <template>
   <el-form ref="form" :model="user" :rules="rules" label-width="80px">
     <el-form-item label="旧密码" prop="oldPassword">
-      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" />
+      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" show-password type="password" />
     </el-form-item>
     <el-form-item label="新密码" prop="newPassword">
-      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" />
+      <el-input v-model="user.newPassword" placeholder="请输入新密码" show-password type="password" />
     </el-form-item>
     <el-form-item label="确认密码" prop="confirmPassword">
-      <el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" />
+      <el-input v-model="user.confirmPassword" placeholder="请确认密码" show-password type="password" />
     </el-form-item>
     <el-form-item>
       <el-button type="primary" size="mini" @click="submit">保存</el-button>

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

@@ -238,6 +238,9 @@ export default {
   },
   created() {
     this.queryParams.examId = this.$route.params.examId
+    if (this.queryParams.examId) {
+      this.queryParams.examType = null
+    }
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
           this.clientHeight = document.body.clientHeight -250