ly před 1 rokem
rodič
revize
19d7ab5f5f

+ 1 - 1
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}</if>
+            <if test="staffId != null  and staffId != ''"> and d.staff_id = #{staffId} and ADD_MONTHS(TRUNC(SYSDATE, 'MM'), 1) > t.course_startdate </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>

+ 2 - 1
ui/src/views/training/elearn/userQu/repo.vue

@@ -125,7 +125,8 @@ export default {
         updaterCode: null,
         updatedate: null,
         deptId: null,
-        remarks: null
+        remarks: null,
+        isStudy: 1,
       },
       // 表单参数
       form: {},