LY 定期培训 超期和补赔

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

@@ -3,6 +3,7 @@ package com.ruoyi.project.training.controller;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.plant.mapper.TStaffmgrMapper;
 import com.ruoyi.project.plant.service.ITStaffmgrService;
@@ -67,7 +68,20 @@ public class TTrainingbccDeviceController extends BaseController
         for (TTrainingbccDevice t: list
              ) {
           TTrainingbcc tTrainingbcc = tTrainingbccService.selectTTrainingbccById(t.getRegularId());
-            t.setTrainingbcc(tTrainingbcc);
+          t.setTrainingbcc(tTrainingbcc);
+          // 判断是否过期
+            t.setIsLock(0);
+            if (tTrainingbcc.getCourseEnddate()!=null) {
+              int r =  DateUtils.compareToDay(DateUtils.getNowDate(),tTrainingbcc.getCourseEnddate());
+                if (r >0) {
+                    t.setIsLock(1);
+                }
+            }
+
+            //如果补赔，可以
+            if ("1".equals(t.getSupplementary())) {
+
+            }
         }
         return getDataTable(list);
     }

master/src/main/java/com/ruoyi/project/training/domain/TTrainingbccDevice.java

@@ -93,6 +93,8 @@ public class TTrainingbccDevice extends BaseEntity
     private TTrainingbcc trainingbcc;
     private String trainingType;
 
+    private Integer isLock;
+
     public String getName() {
         return name;
     }
@@ -286,6 +288,14 @@ public class TTrainingbccDevice extends BaseEntity
         this.units = units;
     }
 
+    public Integer getIsLock() {
+        return isLock;
+    }
+
+    public void setIsLock(Integer isLock) {
+        this.isLock = isLock;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -69,7 +69,7 @@
       </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 slot-scope="scope">
+        <template v-if="scope.row.isLock != 1"  slot-scope="scope">
           <el-button
             size="mini"
             type="text"

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

@@ -152,7 +152,7 @@
               <el-button @click="upload.open = false">取 消</el-button>
           </div>
       </el-dialog>
-    <el-dialog :visible.sync="detailOpen" title="考试明细" width="60%" append-to-body>
+    <el-dialog v-if="detailOpen" :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" />