|
@@ -344,6 +344,12 @@
|
|
|
irdr.data_type_ = 'INSPECTION_ITEM_PLAN'
|
|
|
</if>
|
|
|
</if>
|
|
|
+ <if test="hasDealTime!=null and hasDealTime">
|
|
|
+ AND irdr.deal_time_ IS NOT NULL
|
|
|
+ </if>
|
|
|
+ <if test="hasDealTime!=null and !hasDealTime">
|
|
|
+ AND irdr.deal_time_ IS NULL
|
|
|
+ </if>
|
|
|
<if test="itemId != null">
|
|
|
AND iip.item_id_ = #{itemId}
|
|
|
</if>
|
|
@@ -423,6 +429,12 @@
|
|
|
<sql id="queryErrStudentVisitCondition">
|
|
|
<where>
|
|
|
irdr.data_type_ = 'STUDENT_VISIT'
|
|
|
+ <if test="hasDealTime!=null and hasDealTime">
|
|
|
+ AND irdr.deal_time_ IS NOT NULL
|
|
|
+ </if>
|
|
|
+ <if test="hasDealTime!=null and !hasDealTime">
|
|
|
+ AND irdr.deal_time_ IS NULL
|
|
|
+ </if>
|
|
|
<if test="organId != null">
|
|
|
AND FIND_IN_SET(ii.organ_id_,#{organId})
|
|
|
</if>
|
|
@@ -533,13 +545,18 @@
|
|
|
|
|
|
<sql id="endFindCourseSchedulesCondition">
|
|
|
<where>
|
|
|
- cs.del_flag_ = 0
|
|
|
<if test="searchType == 'ERR_ATTENDANCE'">
|
|
|
AND irdr.data_type_ = 'TEACHER_EXCEPTION_ATTENDANCE'
|
|
|
</if>
|
|
|
<if test="searchType == 'NO_ATTENDANCE'">
|
|
|
AND irdr.data_type_ = 'TEACHER_NOT_A_CLASS'
|
|
|
</if>
|
|
|
+ <if test="hasDealTime!=null and hasDealTime">
|
|
|
+ AND irdr.deal_time_ IS NOT NULL
|
|
|
+ </if>
|
|
|
+ <if test="hasDealTime!=null and !hasDealTime">
|
|
|
+ AND irdr.deal_time_ IS NULL
|
|
|
+ </if>
|
|
|
<if test="mergeCourseType != null and mergeCourseType != ''">
|
|
|
<if test="mergeCourseType == 'MASTER'">
|
|
|
AND cs.new_course_id_ = cs.id_
|