|
@@ -649,7 +649,7 @@
|
|
LEFT JOIN inspection i ON ii.inspection_id_ = i.id_
|
|
LEFT JOIN inspection i ON ii.inspection_id_ = i.id_
|
|
WHERE ii.item_ = 'VISIT' AND ii.memo_ =''
|
|
WHERE ii.item_ = 'VISIT' AND ii.memo_ =''
|
|
AND ii.times_ > (SELECT COUNT(DISTINCT sv.id_) FROM student_visit sv
|
|
AND ii.times_ > (SELECT COUNT(DISTINCT sv.id_) FROM student_visit sv
|
|
- WHERE sv.teacher_id_ = ii.user_id_ AND DATE_FORMAT(ii.create_time_,'%Y-%m') = DATE_FORMAT(sv.visit_time_,'%Y-%m'))
|
|
|
|
|
|
+ WHERE sv.teacher_id_ = ii.user_id_ AND DATE_FORMAT(i.month_,'%Y-%m') = DATE_FORMAT(sv.visit_time_,'%Y-%m'))
|
|
AND i.month_ >= #{startTime} AND i.month_ <= DATE_FORMAT(NOW(),'%Y-%m-%d')
|
|
AND i.month_ >= #{startTime} AND i.month_ <= DATE_FORMAT(NOW(),'%Y-%m-%d')
|
|
<if test="organIdsStr != null and organIdsStr != ''">
|
|
<if test="organIdsStr != null and organIdsStr != ''">
|
|
AND FIND_IN_SET(ii.organ_id_,#{organIdsStr})
|
|
AND FIND_IN_SET(ii.organ_id_,#{organIdsStr})
|