虚仿实验教学实验导出bug修复

src/main/resources/mapper/tms/ProjectRecordDao.xml

@@ -107,8 +107,9 @@
         FROM tms_project_record tpr
                  LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
                  LEFT JOIN tms_experimental_teaching tet ON tpr.projectId = tet.project_id
+                 LEFT JOIN tms_experimental_report ter ON ter.projectId = tet.id
         WHERE tpr.userId = #{userid}
-          AND tpr.isdel = #{isdel}
+          AND ter.eventId = tpr.recordId
           AND tpr.projectId = tet.project_id
           AND tp.projectPermissions != 0
         ORDER BY
@@ -185,8 +186,10 @@
                recordState
         FROM tms_project_record tpr
                  LEFT JOIN hr_project_management tp ON tpr.projectId = tp.projectId
+                 LEFT JOIN tms_experimental_report re ON re.eventId = tpr.recordId
         WHERE tpr.userId = #{userid}
-          AND tpr.isdel = #{isdel}
+--         注释掉报错，>=表示是否删除都导出
+          AND tpr.isdel >= #{isdel}
           AND tp.projectPermissions = 0
     </select>
     <select id="queryReport" resultType="com.msdw.tms.entity.ProjectRecordEntity">