Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform-mld/src/main/resources/mapper/ReportMapper.xml

@@ -1592,30 +1592,10 @@
                     t.company_id = #{companyId}
                   AND te.first_auditor_id IS NOT NULL
                   AND te.second_auditor_id IS NOT NULL
-                  AND te.audit_status IN (3, 4)
-
+                  AND t.task_status IN (3, 4)
                     <if test="startDate != null and endDate != null">
-                        AND (
-
-                        ((t.start_date IS NULL OR t.start_date &lt;= #{endDate}) AND (t.end_date &gt;= #{startDate}))
-                        OR
-
-                        ((t.end_date IS NULL OR t.end_date &gt;= #{startDate}) AND (t.start_date &lt;= #{endDate}))
-                        OR
-
-                        (t.start_date &gt;= #{startDate} AND t.end_date &lt;= #{endDate})
-                        OR
-
-                        (t.start_date &lt;= #{startDate} AND t.end_date &gt;= #{endDate})
-                        )
-                    </if>
-                    <if test="startDate != null and endDate == null">
-                        AND (t.end_date IS NOT NULL AND t.end_date &gt;= #{startDate})
+                       and t.start_date &lt; #{endDate} AND t.end_date &gt; #{startDate}
                     </if>
-                    <if test="startDate == null and endDate != null">
-                        AND (t.start_date IS NOT NULL AND t.start_date &lt;= #{endDate})
-                    </if>
-
                 GROUP BY
                     t.id
             ) b ON (u.id = b.first_auditor_id AND b.audit_status = 3)
@@ -1654,27 +1634,9 @@
                     t.company_id = #{companyId}
                   AND te.first_auditor_id IS NOT NULL
                   AND te.second_auditor_id IS NOT NULL
-                  AND te.audit_status IN (3, 4)
+                AND t.task_status IN (3, 4)
                 <if test="startDate != null and endDate != null">
-                    AND (
-
-                    ((t.start_date IS NULL OR t.start_date &lt;= #{endDate}) AND (t.end_date &gt;= #{startDate}))
-                    OR
-
-                    ((t.end_date IS NULL OR t.end_date &gt;= #{startDate}) AND (t.start_date &lt;= #{endDate}))
-                    OR
-
-                    (t.start_date &gt;= #{startDate} AND t.end_date &lt;= #{endDate})
-                    OR
-
-                    (t.start_date &lt;= #{startDate} AND t.end_date &gt;= #{endDate})
-                    )
-                </if>
-                <if test="startDate != null and endDate == null">
-                    AND (t.end_date IS NOT NULL AND t.end_date &gt;= #{startDate})
-                </if>
-                <if test="startDate == null and endDate != null">
-                    AND (t.start_date IS NOT NULL AND t.start_date &lt;= #{endDate})
+                 and   t.start_date &lt; #{endDate} AND t.end_date &gt; #{startDate}
                 </if>
             ) b ON (u.id = b.first_auditor_id AND b.audit_status = 3)
                 OR (u.id = b.second_auditor_id AND b.audit_status = 4)