ly 我的定期培训列表

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

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join t_staffmgr s on s.staffid = d.staff_id
         left join t_trainingbcc t on t.id = d.regular_id and t.DEL_FLAG = 0
         <where>
-            <if test="staffId != null  and staffId != ''"> and d.staff_id = #{staffId} and ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 1) > t.course_startdate </if>
+            <if test="staffId != null  and staffId != ''"> and d.staff_id = #{staffId} and ((ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 1) > t.course_startdate and t.course_enddate >= SYSDATE) or (d.supplementary = 1 and d.exam_state = 0))  </if>
             <if test="regularId != null "> and d.regular_id = #{regularId}</if>
             <if test="startDate != null "> and d.start_date = #{startDate}</if>
             <if test="remarks != null  and remarks != ''"> and d.remarks = #{remarks}</if>

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

@@ -42,7 +42,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="开始日期" align="center" prop="startDate" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.trainingbcc.courseStartdate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="截止日期" align="center" prop="startDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.trainingbcc.courseEnddate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="参培人" align="center" prop="name" width="100">
@@ -64,7 +69,7 @@
 
       <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">
+      <el-table-column label="考试状态" align="center" prop="examState"  :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>